X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fcrypt.c;h=8ccac1167bfc7dd3d1ae7d2dadb4a3af416cdddd;hb=1e73e3243b4a748ee98b58f6f2512a14785bb36d;hp=87c1b41877ae366a0c04c5a23766bd6f211f8aaf;hpb=942efc4dec4e092c10aaf50b93e316131b6a1aa8;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 87c1b41..8ccac11 100644
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -32,8 +32,6 @@
 #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)
 {
@@ -54,16 +52,6 @@ void crypt_current_time (STATE * s, const char *app_name)
   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)
@@ -79,26 +67,6 @@ static void disable_coredumps (void)
 
 #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 *pbody = NULL, *tmp_pbody = NULL;
@@ -107,9 +75,6 @@ int mutt_protect (HEADER * msg, char *keylist)
   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 ())
@@ -265,35 +230,31 @@ int crypt_query (BODY * m)
 }
 
 
-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;
 }
 
 
@@ -305,9 +266,9 @@ void convert_to_7bit (BODY * a)
       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")) {
@@ -319,8 +280,7 @@ void convert_to_7bit (BODY * a)
     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;
   }
@@ -334,7 +294,7 @@ void crypt_extract_keys_from_messages (HEADER * h)
   address_t *tmp = NULL;
   FILE *fpout;
 
-  fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
+  fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(MCore.tmpdir), NULL);
   if (!fpout) {
     mutt_error(_("Could not create temporary file"));
     return;
@@ -346,13 +306,6 @@ void crypt_extract_keys_from_messages (HEADER * 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)) {
-          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);
@@ -391,36 +344,34 @@ void crypt_extract_keys_from_messages (HEADER * h)
   }
   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);
-        fflush (fpout);
-        mutt_endwin (_("Trying to extract PGP keys...\n"));
-        crypt_pgp_invoke_import (tempfname);
-      }
+    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 & ENCRYPT)
-          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);
-
-        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);
-        }
+    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);
+      else
+        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);
       }
     }
   }
 
-  fclose (fpout);
+  m_fclose(&fpout);
   if (isendwin ())
     mutt_any_key_to_continue (NULL);
 
@@ -543,36 +494,35 @@ int mutt_signed_handler (BODY * a, STATE * s)
     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);