X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fcrypt.c;h=66e95885b2c9af22912795f90b75e77bc0387a1c;hp=af29c47595bc38b85447ab488d17b3a67e3dca1a;hb=774b53097f8c8b62c5101bce8f313d339387a438;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index af29c47..66e9588 100644
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -194,7 +194,7 @@ int mutt_protect (HEADER * msg, char *keylist)
            which tmp_smime_pbody->parts after signing. */
         tmp_smime_pbody->parts = tmp_smime_pbody->parts->next;
         msg->content->next = NULL;
-        mutt_free_body (&tmp_smime_pbody);
+        body_list_wipe(&tmp_smime_pbody);
       }
       pbody = tmp_pbody;
     }
@@ -208,7 +208,7 @@ int mutt_protect (HEADER * msg, char *keylist)
           /* remove the outer multipart layer */
           tmp_pgp_pbody = mutt_remove_multipart (tmp_pgp_pbody);
           /* get rid of the signature */
-          mutt_free_body (&tmp_pgp_pbody->next);
+          body_list_wipe(&tmp_pgp_pbody->next);
         }
 
         return (-1);
@@ -220,7 +220,7 @@ int mutt_protect (HEADER * msg, char *keylist)
        */
       if (flags != msg->security) {
         tmp_pgp_pbody = mutt_remove_multipart (tmp_pgp_pbody);
-        mutt_free_body (&tmp_pgp_pbody->next);
+        body_list_wipe(&tmp_pgp_pbody->next);
       }
     }
   }
@@ -232,162 +232,6 @@ int mutt_protect (HEADER * msg, char *keylist)
 }
 
 
-
-
-int mutt_is_multipart_signed (BODY * b)
-{
-  char *p;
-
-  if (!b || !(b->type == TYPEMULTIPART) ||
-      !b->subtype || ascii_strcasecmp (b->subtype, "signed"))
-    return 0;
-
-  if (!(p = mutt_get_parameter ("protocol", b->parameter)))
-    return 0;
-
-  if (!(ascii_strcasecmp (p, "multipart/mixed")))
-    return SIGN;
-
-  if (!(ascii_strcasecmp (p, "application/pgp-signature")))
-    return PGPSIGN;
-
-  if (!(ascii_strcasecmp (p, "application/x-pkcs7-signature")))
-    return SMIMESIGN;
-  if (!(ascii_strcasecmp (p, "application/pkcs7-signature")))
-    return SMIMESIGN;
-
-  return 0;
-}
-
-
-int mutt_is_multipart_encrypted (BODY * b)
-{
-  char *p;
-
-  if (!b || b->type != TYPEMULTIPART ||
-      !b->subtype || ascii_strcasecmp (b->subtype, "encrypted") ||
-      !(p = mutt_get_parameter ("protocol", b->parameter)) ||
-      ascii_strcasecmp (p, "application/pgp-encrypted"))
-    return 0;
-
-  return PGPENCRYPT;
-}
-
-
-int mutt_is_application_pgp (BODY * m)
-{
-  int t = 0;
-  char *p;
-
-  if (m->type == TYPEAPPLICATION) {
-    if (!ascii_strcasecmp (m->subtype, "pgp")
-        || !ascii_strcasecmp (m->subtype, "x-pgp-message")) {
-      if ((p = mutt_get_parameter ("x-action", m->parameter))
-          && (!ascii_strcasecmp (p, "sign")
-              || !ascii_strcasecmp (p, "signclear")))
-        t |= PGPSIGN;
-
-      if ((p = mutt_get_parameter ("format", m->parameter)) &&
-          !ascii_strcasecmp (p, "keys-only"))
-        t |= PGPKEY;
-
-      if (!t)
-        t |= PGPENCRYPT;        /* not necessarily correct, but... */
-    }
-
-    if (!ascii_strcasecmp (m->subtype, "pgp-signed"))
-      t |= PGPSIGN;
-
-    if (!ascii_strcasecmp (m->subtype, "pgp-keys"))
-      t |= PGPKEY;
-  }
-  else if (m->type == TYPETEXT && ascii_strcasecmp ("plain", m->subtype) == 0) {
-    if (((p = mutt_get_parameter ("x-mutt-action", m->parameter))
-         || (p = mutt_get_parameter ("x-action", m->parameter))
-         || (p = mutt_get_parameter ("action", m->parameter)))
-        && !ascii_strncasecmp ("pgp-sign", p, 8))
-      t |= PGPSIGN;
-    else if (p && !ascii_strncasecmp ("pgp-encrypt", p, 11))
-      t |= PGPENCRYPT;
-    else if (p && !ascii_strncasecmp ("pgp-keys", p, 7))
-      t |= PGPKEY;
-  }
-  if (t)
-    t |= PGPINLINE;
-
-  return t;
-}
-
-int mutt_is_application_smime (BODY * m)
-{
-  char *t = NULL;
-  int len, complain = 0;
-
-  if (!m)
-    return 0;
-
-  if ((m->type & TYPEAPPLICATION) && m->subtype) {
-    /* S/MIME MIME types don't need x- anymore, see RFC2311 */
-    if (!ascii_strcasecmp (m->subtype, "x-pkcs7-mime") ||
-        !ascii_strcasecmp (m->subtype, "pkcs7-mime")) {
-      if ((t = mutt_get_parameter ("smime-type", m->parameter))) {
-        if (!ascii_strcasecmp (t, "enveloped-data"))
-          return SMIMEENCRYPT;
-        else if (!ascii_strcasecmp (t, "signed-data"))
-          return (SMIMESIGN | SMIMEOPAQUE);
-        else
-          return 0;
-      }
-      /* Netscape 4.7 uses 
-       * Content-Description: S/MIME Encrypted Message
-       * instead of Content-Type parameter
-       */
-      if (!ascii_strcasecmp (m->description, "S/MIME Encrypted Message"))
-        return SMIMEENCRYPT;
-      complain = 1;
-    }
-    else if (ascii_strcasecmp (m->subtype, "octet-stream"))
-      return 0;
-
-    t = mutt_get_parameter ("name", m->parameter);
-
-    if (!t)
-      t = m->d_filename;
-    if (!t)
-      t = m->filename;
-    if (!t) {
-      if (complain)
-        mutt_message (_
-                      ("S/MIME messages with no hints on content are unsupported."));
-      return 0;
-    }
-
-    /* no .p7c, .p10 support yet. */
-
-    len = m_strlen(t) - 4;
-    if (len > 0 && *(t + len) == '.') {
-      len++;
-      if (!ascii_strcasecmp ((t + len), "p7m"))
-#if 0
-        return SMIMEENCRYPT;
-#else
-        /* Not sure if this is the correct thing to do, but 
-           it's required for compatibility with Outlook */
-        return (SMIMESIGN | SMIMEOPAQUE);
-#endif
-      else if (!ascii_strcasecmp ((t + len), "p7s"))
-        return (SMIMESIGN | SMIMEOPAQUE);
-    }
-  }
-
-  return 0;
-}
-
-
-
-
-
-
 int crypt_query (BODY * m)
 {
   int t = 0;
@@ -440,8 +284,6 @@ int crypt_query (BODY * m)
 }
 
 
-
-
 int crypt_write_signed (BODY * a, STATE * s, const char *tempfile)
 {
   FILE *fp;
@@ -511,8 +353,6 @@ void convert_to_7bit (BODY * a)
 }
 
 
-
-
 void crypt_extract_keys_from_messages (HEADER * h)
 {
   int i;
@@ -679,7 +519,7 @@ int mutt_signed_handler (BODY * a, STATE * s)
   short goodsig = 1;
   int rc = 0;
 
-  protocol = mutt_get_parameter ("protocol", a->parameter);
+  protocol = parameter_getval(a->parameter, "protocol");
   a = a->parts;
 
   /* extract the protocol information */