X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fsmime.c;h=fa7feac8dbced5661dcd882036a66f45ea7fbd96;hp=5d773cd100b0d1c68e838f323728c19880ff3271;hb=69f4685e616347559d4ec714fd826d7f97a472ef;hpb=711f787502b6a1a1c150b948a5ed9156c8ef9ba1

diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index 5d773cd..fa7feac 100644
--- a/lib-crypt/smime.c
+++ b/lib-crypt/smime.c
@@ -35,7 +35,6 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
-#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
@@ -256,7 +255,6 @@ static void mutt_smime_command (char *d, ssize_t dlen,
 {
   mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_smime_command,
                      (unsigned long) cctx, 0);
-  debug_print (2, ("%s\n", d));
 }
 
 static pid_t smime_invoke (FILE ** smimein, FILE ** smimeout,
@@ -1309,8 +1307,8 @@ BODY *smime_build_smime_entity (BODY * a, char *certlist)
   t = mutt_new_body ();
   t->type = TYPEAPPLICATION;
   t->subtype = m_strdup("x-pkcs7-mime");
-  mutt_set_parameter ("name", "smime.p7m", &t->parameter);
-  mutt_set_parameter ("smime-type", "enveloped-data", &t->parameter);
+  parameter_setval(&t->parameter, "name", "smime.p7m");
+  parameter_setval(&t->parameter, "smime-type", "enveloped-data");
   t->encoding = ENCBASE64;      /* The output of OpenSSL SHOULD be binary */
   t->use_disp = 1;
   t->disposition = DISPATTACH;
@@ -1429,11 +1427,11 @@ BODY *smime_sign_message (BODY * a)
   t->use_disp = 0;
   t->disposition = DISPINLINE;
 
-  mutt_generate_boundary (&t->parameter);
+  parameter_set_boundary(&t->parameter);
   /* check if this can be extracted from private key somehow.... */
-  mutt_set_parameter ("micalg", "sha1", &t->parameter);
-  mutt_set_parameter ("protocol", "application/x-pkcs7-signature",
-                      &t->parameter);
+  parameter_setval(&t->parameter, "micalg", "sha1");
+  parameter_setval(&t->parameter, "protocol",
+                   "application/x-pkcs7-signature");
 
   t->parts = a;
   a = t;
@@ -1454,19 +1452,11 @@ BODY *smime_sign_message (BODY * a)
 }
 
 
-
-
-
-
 /*
  *    Handling S/MIME - bodies.
  */
 
 
-
-
-
-
 static
 pid_t smime_invoke_verify (FILE ** smimein, FILE ** smimeout,
                            FILE ** smimeerr, int smimeinfd, int smimeoutfd,