fixes and simplifications to fix gpg regression.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index dd2eb02..5f744ee 100644 (file)
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -32,8 +32,6 @@
 #include "crypt.h"
 #include "pgp.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)
 {
 /* print the current time to avoid spoofing of the signature output */
 void crypt_current_time (STATE * s, const char *app_name)
 {


@@ -265,35 +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);
-
-  }
-
-  return 0;

 }
 
 
 }
 
 


@@ -547,32 +541,31 @@ int mutt_signed_handler (BODY * a, STATE * s)
       if (!tempfp) {
           mutt_error(_("Could not create temporary file"));
       } else {
       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);
         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);
       }
 
       mutt_unlink (tempfile);