X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fcrypt.c;h=eb60a2da414d968700fca6861170e52841058333;hb=0dbe922d4298aed78dcba64b7c770f315a64505e;hp=66b8531dbf4837e3d5a4be2ac3da87dd996d977c;hpb=4761fa78a6dfc9437caa6e6e0aac806e50e01c83;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 66b8531..eb60a2d 100644
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -16,22 +16,6 @@
 # include "config.h"
 #endif
 
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
-
-#include <lib-mime/mime.h>
-
-#include "mutt.h"
-#include "handler.h"
-#include "mutt_curses.h"
-#include "copy.h"
-#include "crypt.h"
-#include "pgp.h"
-
-
 #include <sys/wait.h>
 #include <string.h>
 #include <stdlib.h>
@@ -41,17 +25,31 @@
 #include <ctype.h>
 
 #ifdef HAVE_LOCALE_H
-#include <locale.h>
+#  include <locale.h>
 #endif
-
 #ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
+#  include <sys/time.h>
 #endif
-
 #ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
+#  include <sys/resource.h>
 #endif
 
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
+
+#include "mutt.h"
+#include "alias.h"
+#include "handler.h"
+#include "copy.h"
+#include "crypt.h"
+#include "pgp.h"
 
 /* print the current time to avoid spoofing of the signature output */
 void crypt_current_time (STATE * s, const char *app_name)
@@ -83,7 +81,7 @@ void crypt_forget_passphrase (void)
 }
 
 
-#if defined(HAVE_SETRLIMIT) && (!defined(DEBUG))
+#if defined(HAVE_SETRLIMIT)
 
 static void disable_coredumps (void)
 {
@@ -103,7 +101,7 @@ int crypt_valid_passphrase (int flags)
 {
   int ret = 0;
 
-# if defined(HAVE_SETRLIMIT) &&(!defined(DEBUG))
+# if defined(HAVE_SETRLIMIT)
   disable_coredumps ();
 # endif
 
@@ -196,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;
     }
@@ -210,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);
@@ -222,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);
       }
     }
   }
@@ -244,7 +242,7 @@ int mutt_is_multipart_signed (BODY * b)
       !b->subtype || ascii_strcasecmp (b->subtype, "signed"))
     return 0;
 
-  if (!(p = mutt_get_parameter ("protocol", b->parameter)))
+  if (!(p = parameter_getval(b->parameter, "protocol")))
     return 0;
 
   if (!(ascii_strcasecmp (p, "multipart/mixed")))
@@ -268,7 +266,7 @@ int mutt_is_multipart_encrypted (BODY * b)
 
   if (!b || b->type != TYPEMULTIPART ||
       !b->subtype || ascii_strcasecmp (b->subtype, "encrypted") ||
-      !(p = mutt_get_parameter ("protocol", b->parameter)) ||
+      !(p = parameter_getval(b->parameter, "protocol")) ||
       ascii_strcasecmp (p, "application/pgp-encrypted"))
     return 0;
 
@@ -284,12 +282,12 @@ int mutt_is_application_pgp (BODY * m)
   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))
+      if ((p = parameter_getval(m->parameter, "x-action"))
           && (!ascii_strcasecmp (p, "sign")
               || !ascii_strcasecmp (p, "signclear")))
         t |= PGPSIGN;
 
-      if ((p = mutt_get_parameter ("format", m->parameter)) &&
+      if ((p = parameter_getval(m->parameter, "format")) &&
           !ascii_strcasecmp (p, "keys-only"))
         t |= PGPKEY;
 
@@ -304,9 +302,9 @@ int mutt_is_application_pgp (BODY * m)
       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)))
+    if (((p = parameter_getval(m->parameter, "x-mutt-action"))
+         || (p = parameter_getval(m->parameter, "x-action"))
+         || (p = parameter_getval(m->parameter, "action")))
         && !ascii_strncasecmp ("pgp-sign", p, 8))
       t |= PGPSIGN;
     else if (p && !ascii_strncasecmp ("pgp-encrypt", p, 11))
@@ -332,7 +330,7 @@ int mutt_is_application_smime (BODY * m)
     /* 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 ((t = parameter_getval(m->parameter, "smime-type"))) {
         if (!ascii_strcasecmp (t, "enveloped-data"))
           return SMIMEENCRYPT;
         else if (!ascii_strcasecmp (t, "signed-data"))
@@ -351,7 +349,7 @@ int mutt_is_application_smime (BODY * m)
     else if (ascii_strcasecmp (m->subtype, "octet-stream"))
       return 0;
 
-    t = mutt_get_parameter ("name", m->parameter);
+    t = parameter_getval(m->parameter, "name");
 
     if (!t)
       t = m->d_filename;
@@ -681,7 +679,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 */