Users don't know what they are doing most of the time…

[apps/madmutt.git] / lib-crypt / crypt.c

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 3ee7853..f8cf471 100644 (file)
--- 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)
 {
@@ -122,10 +120,8 @@ int mutt_protect (HEADER * msg, char *keylist)
     }
 
     /* 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?")))
+    if ((i = query_quadoption(OPT_PGPMIMEAUTO,
+        _("Message can't be sent inline.  Revert to using PGP/MIME?")))
         != M_YES) {
       mutt_error _("Mail not sent.");
 
@@ -267,36 +263,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);
-
-  }
-  fclose (fp);
-
-  return 0;
 }
 
 
@@ -308,9 +299,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")) {
@@ -322,8 +313,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;
   }
@@ -337,7 +327,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;
@@ -352,7 +342,7 @@ void crypt_extract_keys_from_messages (HEADER * h)
         if (Context->hdrs[Context->v2r[i]]->security & ENCRYPT &&
             !crypt_valid_passphrase (Context->hdrs[Context->v2r[i]]->
                                      security)) {
-          fclose (fpout);
+          m_fclose(&fpout);
           break;
         }
 
@@ -423,7 +413,7 @@ void crypt_extract_keys_from_messages (HEADER * h)
     }
   }
 
-  fclose (fpout);
+  m_fclose(&fpout);
   if (isendwin ())
     mutt_any_key_to_continue (NULL);
 
@@ -546,35 +536,34 @@ 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_perror (tempfile);
-      }
-      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);
-         }
+          mutt_error(_("Could not create temporary file"));
+      } else {
+        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);
         }
       }