#include <lib-lib/lib-lib.h>
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif
-
#include <lib-mime/mime.h>
-
#include <lib-ui/curses.h>
#include <lib-mx/mx.h>
#include "handler.h"
#include "copy.h"
#include "crypt.h"
-#include "pgp.h"
-
-static int crypt_write_signed (BODY *, STATE *, FILE *);
-
-/* print the current time to avoid spoofing of the signature output */
-void crypt_current_time (STATE * s, const char *app_name)
-{
- time_t t;
- char p[STRING], tmp[STRING];
-
- if (option (OPTCRYPTTIMESTAMP)) {
- t = time (NULL);
- setlocale (LC_TIME, "");
- strftime (p, sizeof (p), _(" (current time: %c)"), localtime (&t));
- setlocale (LC_TIME, "C");
- }
- else
- *p = '\0';
-
- snprintf (tmp, sizeof (tmp), _("[-- %s output follows%s --]\n"),
- NONULL (app_name), p);
- state_attach_puts (tmp, s);
-}
-
-
-
-void crypt_forget_passphrase (void)
-{
- crypt_pgp_void_passphrase ();
- crypt_smime_void_passphrase ();
- mutt_message _("Passphrase(s) forgotten.");
-}
-
-
-#if defined(HAVE_SETRLIMIT)
-
-static void disable_coredumps (void)
-{
- struct rlimit rl = { 0, 0 };
- static short done = 0;
-
- if (!done) {
- setrlimit (RLIMIT_CORE, &rl);
- done = 1;
- }
-}
-
-#endif /* HAVE_SETRLIMIT */
-
-
-int crypt_valid_passphrase (int flags)
-{
- int ret = 0;
-
-# if defined(HAVE_SETRLIMIT)
- disable_coredumps ();
-# endif
-
- if (flags & APPLICATION_PGP)
- ret = crypt_pgp_valid_passphrase ();
-
- if (flags & APPLICATION_SMIME)
- ret = crypt_smime_valid_passphrase ();
-
- return ret;
-}
-
-
int mutt_protect (HEADER * msg, char *keylist)
{
BODY *tmp_smime_pbody = NULL;
BODY *tmp_pgp_pbody = NULL;
int flags = msg->security;
- int i;
-
- if ((msg->security & SIGN) && !crypt_valid_passphrase (msg->security))
- return (-1);
-
- if ((msg->security & PGPINLINE) == PGPINLINE) {
- /* they really want to send it inline... go for it */
- if (!isendwin ())
- mutt_endwin _("Invoking PGP...");
-
- pbody = crypt_pgp_traditional_encryptsign (msg->content, flags, keylist);
- if (pbody) {
- msg->content = pbody;
- return 0;
- }
-
- /* otherwise inline won't work...ask for revert */
- if ((i = query_quadoption(OPT_PGPMIMEAUTO,
- _("Message can't be sent inline. Revert to using PGP/MIME?")))
- != M_YES) {
- mutt_error _("Mail not sent.");
-
- return -1;
- }
-
- /* go ahead with PGP/MIME */
- }
if (!isendwin ())
mutt_endwin (NULL);
}
-static int crypt_write_signed (BODY * a, STATE * s, FILE *fp)
+static void crypt_write_signed(BODY * a, STATE * s, FILE *fp)
{
- int c;
- short hadcr;
- size_t bytes;
-
- fseeko (s->fpin, a->hdr_offset, 0);
- bytes = a->length + a->offset - a->hdr_offset;
- hadcr = 0;
- while (bytes > 0) {
- if ((c = fgetc (s->fpin)) == EOF)
- break;
-
- bytes--;
-
- if (c == '\r')
- hadcr = 1;
- else {
- if (c == '\n' && !hadcr)
- fputc ('\r', fp);
-
- hadcr = 0;
+ int c;
+ short hadcr;
+ size_t bytes;
+
+ fseeko (s->fpin, a->hdr_offset, 0);
+ bytes = a->length + a->offset - a->hdr_offset;
+ hadcr = 0;
+ while (bytes > 0) {
+ if ((c = fgetc (s->fpin)) == EOF)
+ break;
+
+ bytes--;
+
+ if (c == '\r')
+ hadcr = 1;
+ else {
+ if (c == '\n' && !hadcr)
+ fputc ('\r', fp);
+
+ hadcr = 0;
+ }
+ fputc (c, fp);
}
-
- fputc (c, fp);
-
- }
-
- return 0;
}
if (a->encoding != ENC7BIT) {
a->encoding = ENC7BIT;
convert_to_7bit (a->parts);
- }
- else if (option (OPTPGPSTRICTENC))
+ } else {
convert_to_7bit (a->parts);
+ }
}
else if (a->type == TYPEMESSAGE &&
m_strcasecmp(a->subtype, "delivery-status")) {
else if (a->encoding == ENCBINARY)
a->encoding = ENCBASE64;
else if (a->content && a->encoding != ENCBASE64 &&
- (a->content->from || (a->content->space &&
- option (OPTPGPSTRICTENC))))
+ (a->content->from || a->content->space))
a->encoding = ENCQUOTEDPRINTABLE;
a = a->next;
}
}
-void crypt_extract_keys_from_messages (HEADER * h)
+static void extract_keys_aux(FILE *fpout, HEADER *h)
{
- int i;
- char tempfname[_POSIX_PATH_MAX], *mbox;
- address_t *tmp = NULL;
- FILE *fpout;
-
- fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
- if (!fpout) {
- mutt_error(_("Could not create temporary file"));
- return;
- }
-
- set_option (OPTDONTHANDLEPGPKEYS);
-
- if (!h) {
- for (i = 0; i < Context->vcount; i++) {
- if (Context->hdrs[Context->v2r[i]]->tagged) {
- mutt_parse_mime_message (Context, Context->hdrs[Context->v2r[i]]);
- if (Context->hdrs[Context->v2r[i]]->security & ENCRYPT &&
- !crypt_valid_passphrase (Context->hdrs[Context->v2r[i]]->
- security)) {
- m_fclose(&fpout);
- break;
- }
-
- if (Context->hdrs[Context->v2r[i]]->security & APPLICATION_PGP) {
- mutt_copy_message (fpout, Context, Context->hdrs[Context->v2r[i]],
- M_CM_DECODE | M_CM_CHARCONV, 0);
- fflush (fpout);
-
- mutt_endwin (_("Trying to extract PGP keys...\n"));
- crypt_pgp_invoke_import (tempfname);
- }
-
- if (Context->hdrs[Context->v2r[i]]->security & APPLICATION_SMIME) {
- if (Context->hdrs[Context->v2r[i]]->security & ENCRYPT)
- mutt_copy_message (fpout, Context, Context->hdrs[Context->v2r[i]],
- M_CM_NOHEADER | M_CM_DECODE_CRYPT
- | M_CM_DECODE_SMIME, 0);
- else
- mutt_copy_message (fpout, Context,
- Context->hdrs[Context->v2r[i]], 0, 0);
- fflush (fpout);
-
- if (Context->hdrs[Context->v2r[i]]->env->from)
- tmp = mutt_expand_aliases (h->env->from);
- else if (Context->hdrs[Context->v2r[i]]->env->sender)
- tmp = mutt_expand_aliases (Context->hdrs[Context->v2r[i]]
- ->env->sender);
- mbox = tmp ? tmp->mailbox : NULL;
- if (mbox) {
- mutt_endwin (_("Trying to extract S/MIME certificates...\n"));
- crypt_smime_invoke_import (tempfname, mbox);
- tmp = NULL;
- }
- }
-
- rewind (fpout);
- }
- }
- }
- else {
mutt_parse_mime_message (Context, h);
- if (!(h->security & ENCRYPT && !crypt_valid_passphrase (h->security))) {
- if (h->security & APPLICATION_PGP) {
- mutt_copy_message (fpout, Context, h, M_CM_DECODE | M_CM_CHARCONV, 0);
+
+ rewind(fpout);
+ if (h->security & APPLICATION_PGP) {
+ mutt_copy_message(fpout, Context, h, M_CM_DECODE | M_CM_CHARCONV, 0);
fflush (fpout);
+
mutt_endwin (_("Trying to extract PGP keys...\n"));
- crypt_pgp_invoke_import (tempfname);
- }
+ }
- if (h->security & APPLICATION_SMIME) {
+ if (h->security & APPLICATION_SMIME) {
if (h->security & ENCRYPT)
- mutt_copy_message (fpout, Context, h, M_CM_NOHEADER
- | M_CM_DECODE_CRYPT | M_CM_DECODE_SMIME, 0);
+ mutt_copy_message (fpout, Context, h, M_CM_NOHEADER
+ | M_CM_DECODE_CRYPT | M_CM_DECODE_SMIME, 0);
else
- mutt_copy_message (fpout, Context, h, 0, 0);
-
+ mutt_copy_message(fpout, Context, h, 0, 0);
fflush (fpout);
- if (h->env->from)
- tmp = mutt_expand_aliases (h->env->from);
- else if (h->env->sender)
- tmp = mutt_expand_aliases (h->env->sender);
- mbox = tmp ? tmp->mailbox : NULL;
- if (mbox) { /* else ? */
- mutt_message (_("Trying to extract S/MIME certificates...\n"));
- crypt_smime_invoke_import (tempfname, mbox);
- }
- }
+
+ mutt_message (_("Trying to extract S/MIME certificates...\n"));
}
- }
- m_fclose(&fpout);
- if (isendwin ())
- mutt_any_key_to_continue (NULL);
+ rewind(fpout);
+ crypt_invoke_import(fpout, h->security & APPLICATION_SMIME);
+}
- mutt_unlink (tempfname);
+void crypt_extract_keys_from_messages(HEADER * h)
+{
+ FILE *tmpfp = tmpfile();
+ if (!tmpfp) {
+ mutt_error(_("Could not create temporary file"));
+ return;
+ }
- unset_option (OPTDONTHANDLEPGPKEYS);
+ set_option(OPTDONTHANDLEPGPKEYS);
+ if (!h) {
+ int i;
+ for (i = 0; i < Context->vcount; i++) {
+ if (!Context->hdrs[Context->v2r[i]]->tagged)
+ continue;
+ extract_keys_aux(tmpfp, Context->hdrs[Context->v2r[i]]);
+ }
+ } else {
+ extract_keys_aux(tmpfp, h);
+ }
+ unset_option(OPTDONTHANDLEPGPKEYS);
+ m_fclose(&tmpfp);
+
+ if (isendwin())
+ mutt_any_key_to_continue(NULL);
}
crypt_fetch_signatures (&signatures, a->next, &sigcnt);
if (sigcnt) {
- tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!tempfp) {
mutt_error(_("Could not create temporary file"));
} else {
- if (crypt_write_signed (a, s, tempfp) == 0) {
- for (i = 0; i < sigcnt; i++) {
- if (signatures[i]->type == TYPEAPPLICATION
- && !m_strcasecmp(signatures[i]->subtype, "pgp-signature")) {
- if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
- goodsig = 0;
-
- continue;
- }
-
- if (signatures[i]->type == TYPEAPPLICATION
- && (!m_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
- || !m_strcasecmp(signatures[i]->subtype, "pkcs7-signature")))
- {
- if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
- goodsig = 0;
-
- continue;
- }
-
- state_printf (s, _("[-- Warning: "
- "We can't verify %s/%s signatures. --]\n\n"),
- TYPE (signatures[i]), signatures[i]->subtype);
- }
- }
+ crypt_write_signed(a, s, tempfp);
m_fclose(&tempfp);
+ for (i = 0; i < sigcnt; i++) {
+ if (signatures[i]->type == TYPEAPPLICATION
+ && !m_strcasecmp(signatures[i]->subtype, "pgp-signature")) {
+ if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
+ goodsig = 0;
+
+ continue;
+ }
+
+ if (signatures[i]->type == TYPEAPPLICATION
+ && (!m_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
+ || !m_strcasecmp(signatures[i]->subtype, "pkcs7-signature")))
+ {
+ if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
+ goodsig = 0;
+
+ continue;
+ }
+
+ state_printf (s, _("[-- Warning: "
+ "We can't verify %s/%s signatures. --]\n\n"),
+ TYPE (signatures[i]), signatures[i]->subtype);
+ }
}
mutt_unlink (tempfile);
projects / apps / madmutt.git / blobdiff