more crypt simplifications

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

diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index 07bc706..5bd3173 100644 (file)
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -1197,8 +1197,7 @@ static int show_one_sig_status (gpgme_ctx_t ctx, int idx, STATE * s)
 
 /* Do the actual verification step. With IS_SMIME set to true we
    assume S/MIME (surprise!) */
-static int verify_one (BODY * sigbdy, STATE * s,
-                       const char *tempfile, int is_smime)
+int crypt_verify_one(BODY *sigbdy, STATE *s, FILE *fp, int is_smime)
 {
   int badsig = -1;
   int anywarn = 0;
@@ -1215,7 +1214,7 @@ static int verify_one (BODY * sigbdy, STATE * s,
   if (is_smime)
     gpgme_data_set_encoding (signature, GPGME_DATA_ENCODING_BASE64);
 
-  err = gpgme_data_new_from_file (&message, tempfile, 1);
+  err = gpgme_data_new_from_stream(&message, fp);
   if (err) {
     gpgme_data_release (signature);
     mutt_error (_("error allocating data object: %s\n"), gpgme_strerror (err));
@@ -1295,16 +1294,6 @@ static int verify_one (BODY * sigbdy, STATE * s,
   return badsig ? 1 : anywarn ? 2 : 0;
 }
 
-int crypt_pgp_verify_one (BODY * sigbdy, STATE * s, const char *tempfile)
-{
-  return verify_one (sigbdy, s, tempfile, 0);
-}
-
-int crypt_smime_verify_one (BODY * sigbdy, STATE * s, const char *tempfile)
-{
-  return verify_one (sigbdy, s, tempfile, 1);
-}
-
 /*
  * Implementation of `decrypt_part'.
  */
@@ -3689,16 +3678,36 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
   return (keylist);
 }
 
-char *crypt_pgp_findkeys (address_t * to, address_t * cc, address_t * bcc)
+int crypt_get_keys (HEADER * msg, char **keylist)
 {
-  return find_keys (to, cc, bcc, APPLICATION_PGP);
-}
+  /* Do a quick check to make sure that we can find all of the encryption
+   * keys if the user has requested this service.
+   */
 
-char *crypt_smime_findkeys (address_t * to, address_t * cc, address_t * bcc)
-{
-  return find_keys (to, cc, bcc, APPLICATION_SMIME);
+  *keylist = NULL;
+
+  if (msg->security & ENCRYPT) {
+    if (msg->security & APPLICATION_PGP) {
+      set_option(OPTPGPCHECKTRUST);
+      *keylist = find_keys(msg->env->to, msg->env->cc, msg->env->bcc,
+                           APPLICATION_PGP);
+      unset_option(OPTPGPCHECKTRUST);
+      if (!*keylist)
+          return -1;
+    }
+
+    if (msg->security & APPLICATION_SMIME) {
+      *keylist = find_keys(msg->env->to, msg->env->cc, msg->env->bcc,
+                           APPLICATION_SMIME);
+      if (!*keylist)
+          return -1;
+    }
+  }
+
+  return (0);
 }
 
+
 int crypt_send_menu (HEADER * msg, int *redraw, int is_smime)
 {
   crypt_key_t *p;

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index a413c50..60349cf 100644 (file)
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -153,7 +153,7 @@ int crypt_query (BODY * m)
     BODY *p;
     int u, v, w;
 
-    u = m->parts ? 0xffffffff : 0;      /* Bits set in all parts */
+    u = m->parts ? ~0 : 0;      /* Bits set in all parts */
     w = 0;                      /* Bits set in any part  */
 
     for (p = m->parts; p; p = p->next) {
@@ -283,35 +283,6 @@ void crypt_extract_keys_from_messages(HEADER * h)
 
 
 
-int crypt_get_keys (HEADER * msg, char **keylist)
-{
-  /* Do a quick check to make sure that we can find all of the encryption
-   * keys if the user has requested this service.
-   */
-
-  set_option (OPTPGPCHECKTRUST);
-
-  *keylist = NULL;
-
-  if (msg->security & ENCRYPT) {
-    if (msg->security & APPLICATION_PGP) {
-      if ((*keylist = crypt_pgp_findkeys (msg->env->to, msg->env->cc,
-                                          msg->env->bcc)) == NULL)
-        return (-1);
-      unset_option (OPTPGPCHECKTRUST);
-    }
-    if (msg->security & APPLICATION_SMIME) {
-      if ((*keylist = crypt_smime_findkeys (msg->env->to, msg->env->cc,
-                                            msg->env->bcc)) == NULL)
-        return (-1);
-    }
-  }
-
-  return (0);
-}
-
-
-
 static void crypt_fetch_signatures (BODY ***signatures, BODY * a, int *n)
 {
   for (; a; a = a->next) {
@@ -333,113 +304,97 @@ static void crypt_fetch_signatures (BODY ***signatures, BODY * a, int *n)
 
 int mutt_signed_handler (BODY * a, STATE * s)
 {
-  char tempfile[_POSIX_PATH_MAX];
-  FILE * tempfp;
+  unsigned major, minor;
   char *protocol;
-  int protocol_major = TYPEOTHER;
-  char *protocol_minor = NULL;
-
+  int rc, i, goodsig = 1, sigcnt = 0;
   BODY *b = a;
-  BODY **signatures = NULL;
-  int sigcnt = 0;
-  int i;
-  short goodsig = 1;
-  int rc = 0;
 
   protocol = parameter_getval(a->parameter, "protocol");
   a = a->parts;
 
-  /* extract the protocol information */
-
-  if (protocol) {
-    char major[STRING];
-    char *t;
-
-    if ((protocol_minor = strchr (protocol, '/')))
-      protocol_minor++;
-
-    m_strcpy(major, sizeof(major), protocol);
-    if ((t = strchr (major, '/')))
-      *t = '\0';
-
-    protocol_major = mutt_check_mime_type (major);
+  switch (mime_which_token(protocol, -1)) {
+    case MIME_APPLICATION_PGP_SIGNATURE:
+      major = TYPEAPPLICATION;
+      minor = MIME_PGP_SIGNATURE;
+      break;
+    case MIME_APPLICATION_X_PKCS7_SIGNATURE:
+      major = TYPEAPPLICATION;
+      minor = MIME_X_PKCS7_SIGNATURE;
+      break;
+    case MIME_APPLICATION_PKCS7_SIGNATURE:
+      major = TYPEAPPLICATION;
+      minor = MIME_PKCS7_SIGNATURE;
+      break;
+    case MIME_MULTIPART_MIXED:
+      major = TYPEMULTIPART;
+      minor = MIME_MIXED;
+      break;
+
+    default:
+      state_printf(s, _("[-- Error: "
+                        "Unknown multipart/signed protocol %s! --]\n\n"),
+                    protocol);
+      return mutt_body_handler (a, s);
   }
 
   /* consistency check */
-
-  if (!(a && a->next && a->next->type == protocol_major &&
-        !m_strcasecmp(a->next->subtype, protocol_minor))) {
-    state_attach_puts (_("[-- Error: "
-                         "Inconsistent multipart/signed structure! --]\n\n"),
-                       s);
-    return mutt_body_handler (a, s);
-  }
-
-
-  if (protocol_major == TYPEAPPLICATION
-      && !m_strcasecmp(protocol_minor, "pgp-signature"));
-  else if (protocol_major == TYPEAPPLICATION
-           && !(m_strcasecmp(protocol_minor, "x-pkcs7-signature")
-                && m_strcasecmp(protocol_minor, "pkcs7-signature")));
-  else if (protocol_major == TYPEMULTIPART
-           && !m_strcasecmp(protocol_minor, "mixed"));
-  else {
-    state_printf (s, _("[-- Error: "
-                       "Unknown multipart/signed protocol %s! --]\n\n"),
-                  protocol);
+  if (!(a && a->next && a->next->type == major &&
+        mime_which_token(a->next->subtype, -1) == minor))
+  {
+    state_attach_puts(_("[-- Error: "
+                        "Inconsistent multipart/signed structure! --]\n\n"),
+                      s);
     return mutt_body_handler (a, s);
   }
 
   if (s->flags & M_DISPLAY) {
+    BODY **sigs = NULL;
 
-    crypt_fetch_signatures (&signatures, a->next, &sigcnt);
-
+    crypt_fetch_signatures (&sigs, a->next, &sigcnt);
     if (sigcnt) {
-      tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
-      if (!tempfp) {
+      FILE *tmpfp = tmpfile();
+
+      if (!tmpfp) {
           mutt_error(_("Could not create temporary file"));
       } else {
-        crypt_write_signed(a, s, tempfp);
-        m_fclose(&tempfp);
+        crypt_write_signed(a, s, tmpfp);
+        rewind(tmpfp);
         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;
+          if (sigs[i]->type == TYPEAPPLICATION) {
+            int subtype;
 
-            continue;
-          }
+            switch ((subtype = mime_which_token(sigs[i]->subtype, -1))) {
+              case MIME_PGP_SIGNATURE:
+              case MIME_X_PKCS7_SIGNATURE:
+              case MIME_PKCS7_SIGNATURE:
+                if (crypt_verify_one(sigs[i], s, tmpfp, subtype != MIME_PGP_SIGNATURE) != 0)
+                  goodsig = 0;
 
-          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;
+                m_fclose(&tmpfp);
+                continue;
 
-            continue;
+              default:
+                break;
+            }
           }
 
-          state_printf (s, _("[-- Warning: "
-                             "We can't verify %s/%s signatures. --]\n\n"),
-                        TYPE (signatures[i]), signatures[i]->subtype);
+          state_printf(s, _("[-- Warning: "
+                            "We can't verify %s/%s signatures. --]\n\n"),
+                       TYPE (sigs[i]), sigs[i]->subtype);
         }
       }
 
-      mutt_unlink (tempfile);
-
       b->goodsig = goodsig;
-      b->badsig = !goodsig;
+      b->badsig  = !goodsig;
 
       /* Now display the signed body */
-      state_attach_puts (_("[-- The following data is signed --]\n\n"), s);
+      state_attach_puts(_("[-- The following data is signed --]\n\n"), s);
 
-
-      p_delete(&signatures);
+      p_delete(&sigs);
+    } else {
+      state_attach_puts(_("[-- Warning: Can't find any signatures. --]\n\n"),
+                        s);
     }
-    else
-      state_attach_puts (_("[-- Warning: Can't find any signatures. --]\n\n"),
-                         s);
   }
 
   rc = mutt_body_handler (a, s);

diff --git a/lib-crypt/crypt.h b/lib-crypt/crypt.h
index 6f7730d..4f550af 100644 (file)
--- a/lib-crypt/crypt.h
+++ b/lib-crypt/crypt.h
@@ -93,6 +93,7 @@ void convert_to_7bit (BODY *);
 
 void crypt_invoke_import(FILE *stream, int smime);
 int crypt_send_menu(HEADER *msg, int *redraw, int smime);
+int crypt_verify_one(BODY *, STATE *s, FILE *fp, int smime);
 
 
 /*-- crypt.c --*/
@@ -146,10 +147,6 @@ void crypt_pgp_free_key (pgp_key_t * kpp);
 /* Generate a PGP public key attachment. */
 BODY *crypt_pgp_make_key_attachment (char *tempf);
 
-/* This routine attempts to find the keyids of the recipients of a
-   message.  It returns NULL if any of the keys can not be found.  */
-char *crypt_pgp_findkeys (address_t * to, address_t * cc, address_t * bcc);
-
 /* Create a new body with a PGP signed message from A. */
 BODY *crypt_pgp_sign_message (BODY * a);
 
@@ -157,9 +154,6 @@ BODY *crypt_pgp_sign_message (BODY * a);
    later.  This is necessary for $fcc_attach. */
 BODY *crypt_pgp_encrypt_message (BODY * a, char *keylist, int sign);
 
-/* fixme: needs documentation */
-int crypt_pgp_verify_one (BODY * sigbdy, STATE * s, const char *tempf);
-
 /* Access the keyID in K. */
 char *crypt_pgp_keyid (pgp_key_t k);
 
@@ -183,17 +177,10 @@ int crypt_smime_verify_sender (HEADER * h);
 /* Ask for an SMIME key. */
 char *crypt_smime_ask_for_key (char *prompt, char *mailbox, short public);
 
-/* This routine attempts to find the keyids of the recipients of a
-   message.  It returns NULL if any of the keys can not be found.  */
-char *crypt_smime_findkeys (address_t * to, address_t * cc, address_t * bcc);
-
 /* fixme: Needs documentation. */
 BODY *crypt_smime_sign_message (BODY * a);
 
 /* fixme: needs documentation. */
 BODY *crypt_smime_build_smime_entity (BODY * a, char *certlist);
 
-/* fixme: needs documentation */
-int crypt_smime_verify_one (BODY * sigbdy, STATE * s, const char *tempf);
-
 #endif /*MUTT_CRYPT_H */

diff --git a/lib-mime/mime-token.def b/lib-mime/mime-token.def
index 8303e05..86f993e 100644 (file)
--- a/lib-mime/mime-token.def
+++ b/lib-mime/mime-token.def
@@ -47,6 +47,7 @@ mail-reply-to
 message
 message-id
 mime-version
+mixed
 model
 multipart
 multipart/mixed
@@ -59,8 +60,10 @@ organization
 pgp
 pgp-encrypted
 pgp-keys
+pgp-signature
 pgp-signed
 pkcs7-mime
+pkcs7-signature
 plain
 postscript
 print
@@ -94,6 +97,7 @@ x-label
 x-mutt-deleted
 x-pgp-message
 x-pkcs7-mime
+x-pkcs7-signature
 xref
 x-status
 x-uuencode

diff --git a/lib-mime/mime.cpkg b/lib-mime/mime.cpkg
index c4b8d8a..3b71df3 100644 (file)
--- a/lib-mime/mime.cpkg
+++ b/lib-mime/mime.cpkg
@@ -172,6 +172,7 @@ static char *mailcap_init(void)
             string_list_wipe(&UnIgnore);
         }
         string_list_add(&Ignore, s);
+        RETURN();
     };
     void unignore(string_t s) {
         if (m_strcmp(s, "*")) {
@@ -180,6 +181,7 @@ static char *mailcap_init(void)
         } else {
             string_list_wipe(&Ignore);
         }
+        RETURN();
     };
 };