X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt.c;h=e5019eca6517b99cab4199d7280d1c0ef45b784d;hp=128aaa98a5761817ce304917571e6c222017e806;hb=9e6ab0152703ad301042ce8810859f41fbee405a;hpb=96d53ff49c308769efbf708e1e65819077cb7af6

diff --git a/crypt.c b/crypt.c
index 128aaa9..e5019ec 100644
--- a/crypt.c
+++ b/crypt.c
@@ -16,14 +16,17 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
 #include "mutt_curses.h"
 #include "mime.h"
 #include "copy.h"
 #include "mutt_crypt.h"
 #include "pgp.h"
 
-#include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
 
@@ -49,7 +52,7 @@
 
 
 /* print the current time to avoid spoofing of the signature output */
-void crypt_current_time (STATE * s, char *app_name)
+void crypt_current_time (STATE * s, const char *app_name)
 {
   time_t t;
   char p[STRING], tmp[STRING];
@@ -386,7 +389,7 @@ int mutt_is_application_smime (BODY * m)
 
     /* no .p7c, .p10 support yet. */
 
-    len = mutt_strlen (t) - 4;
+    len = str_len (t) - 4;
     if (len > 0 && *(t + len) == '.') {
       len++;
       if (!ascii_strcasecmp ((t + len), "p7m"))
@@ -485,7 +488,7 @@ int crypt_write_signed (BODY * a, STATE * s, const char *tempfile)
     return -1;
   }
 
-  fseek (s->fpin, a->hdr_offset, 0);
+  fseeko (s->fpin, a->hdr_offset, 0);
   bytes = a->length + a->offset - a->hdr_offset;
   hadcr = 0;
   while (bytes > 0) {
@@ -528,7 +531,7 @@ void convert_to_7bit (BODY * a)
         convert_to_7bit (a->parts);
     }
     else if (a->type == TYPEMESSAGE &&
-             safe_strcasecmp (a->subtype, "delivery-status")) {
+             str_casecmp (a->subtype, "delivery-status")) {
       if (a->encoding != ENC7BIT)
         mutt_message_to_7bit (a, NULL);
     }
@@ -695,7 +698,7 @@ int crypt_get_keys (HEADER * msg, char **keylist)
 
 
 
-static void crypt_fetch_signatures (BODY *** signatures, BODY * a, int *n)
+static void crypt_fetch_signatures (BODY ***signatures, BODY * a, int *n)
 {
   if (!WithCrypto)
     return;
@@ -705,7 +708,7 @@ static void crypt_fetch_signatures (BODY *** signatures, BODY * a, int *n)
       crypt_fetch_signatures (signatures, a->parts, n);
     else {
       if ((*n % 5) == 0)
-        safe_realloc (signatures, (*n + 6) * sizeof (BODY **));
+        p_realloc(signatures, *n + 6);
 
       (*signatures)[(*n)++] = a;
     }
@@ -717,7 +720,7 @@ static void crypt_fetch_signatures (BODY *** signatures, BODY * a, int *n)
  * This routine verifies a  "multipart/signed"  body.
  */
 
-void mutt_signed_handler (BODY * a, STATE * s)
+int mutt_signed_handler (BODY * a, STATE * s)
 {
   char tempfile[_POSIX_PATH_MAX];
   char *protocol;
@@ -729,9 +732,10 @@ void mutt_signed_handler (BODY * a, STATE * s)
   int sigcnt = 0;
   int i;
   short goodsig = 1;
+  int rc = 0;
 
   if (!WithCrypto)
-    return;
+    return (-1);
 
   protocol = mutt_get_parameter ("protocol", a->parameter);
   a = a->parts;
@@ -755,30 +759,28 @@ void mutt_signed_handler (BODY * a, STATE * s)
   /* consistency check */
 
   if (!(a && a->next && a->next->type == protocol_major &&
-        !safe_strcasecmp (a->next->subtype, protocol_minor))) {
+        !str_casecmp (a->next->subtype, protocol_minor))) {
     state_attach_puts (_("[-- Error: "
                          "Inconsistent multipart/signed structure! --]\n\n"),
                        s);
-    mutt_body_handler (a, s);
-    return;
+    return mutt_body_handler (a, s);
   }
 
 
   if ((WithCrypto & APPLICATION_PGP)
       && protocol_major == TYPEAPPLICATION
-      && !safe_strcasecmp (protocol_minor, "pgp-signature"));
+      && !str_casecmp (protocol_minor, "pgp-signature"));
   else if ((WithCrypto & APPLICATION_SMIME)
            && protocol_major == TYPEAPPLICATION
-           && !(safe_strcasecmp (protocol_minor, "x-pkcs7-signature")
-                && safe_strcasecmp (protocol_minor, "pkcs7-signature")));
+           && !(str_casecmp (protocol_minor, "x-pkcs7-signature")
+                && str_casecmp (protocol_minor, "pkcs7-signature")));
   else if (protocol_major == TYPEMULTIPART
-           && !safe_strcasecmp (protocol_minor, "mixed"));
+           && !str_casecmp (protocol_minor, "mixed"));
   else {
     state_printf (s, _("[-- Error: "
                        "Unknown multipart/signed protocol %s! --]\n\n"),
                   protocol);
-    mutt_body_handler (a, s);
-    return;
+    return mutt_body_handler (a, s);
   }
 
   if (s->flags & M_DISPLAY) {
@@ -791,7 +793,7 @@ void mutt_signed_handler (BODY * a, STATE * s)
         for (i = 0; i < sigcnt; i++) {
           if ((WithCrypto & APPLICATION_PGP)
               && signatures[i]->type == TYPEAPPLICATION
-              && !safe_strcasecmp (signatures[i]->subtype, "pgp-signature")) {
+              && !str_casecmp (signatures[i]->subtype, "pgp-signature")) {
             if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
               goodsig = 0;
 
@@ -801,8 +803,8 @@ void mutt_signed_handler (BODY * a, STATE * s)
           if ((WithCrypto & APPLICATION_SMIME)
               && signatures[i]->type == TYPEAPPLICATION
               &&
-              (!safe_strcasecmp (signatures[i]->subtype, "x-pkcs7-signature")
-               || !safe_strcasecmp (signatures[i]->subtype,
+              (!str_casecmp (signatures[i]->subtype, "x-pkcs7-signature")
+               || !str_casecmp (signatures[i]->subtype,
                                     "pkcs7-signature"))) {
             if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
               goodsig = 0;
@@ -825,15 +827,17 @@ void mutt_signed_handler (BODY * a, STATE * s)
       state_attach_puts (_("[-- The following data is signed --]\n\n"), s);
 
 
-      FREE (&signatures);
+      p_delete(&signatures);
     }
     else
       state_attach_puts (_("[-- Warning: Can't find any signatures. --]\n\n"),
                          s);
   }
 
-  mutt_body_handler (a, s);
+  rc = mutt_body_handler (a, s);
 
   if (s->flags & M_DISPLAY && sigcnt)
     state_attach_puts (_("\n[-- End of signed data --]\n"), s);
+
+  return (rc);
 }