X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgp.c;h=8875ed998cae8ee5f9b9656792dbb7784bf46ebc;hp=bb55885116d6b17eb999f3fa0c547cfc7e9b007e;hb=1ee89902de184a640c171ae3285bff6882a791bd;hpb=2293e9bc5a94ef33dc596b064c607d6bed5ad1fd

diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c
index bb55885..8875ed9 100644
--- a/lib-crypt/pgp.c
+++ b/lib-crypt/pgp.c
@@ -17,15 +17,11 @@
  * a message.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
 
 #include <lib-mime/mime.h>
 
@@ -39,27 +35,6 @@
 #include "copy.h"
 #include "attach.h"
 
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif
-
 #include "crypt.h"
 
 
@@ -518,13 +493,13 @@ static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
 
   /* fix the content type */
 
-  mutt_set_parameter ("format", "fixed", &b->parameter);
+  parameter_setval(&b->parameter, "format", "fixed");
   if (enc)
-    mutt_set_parameter ("x-action", "pgp-encrypted", &b->parameter);
+    parameter_setval(&b->parameter, "x-action", "pgp-encrypted");
   else if (sgn)
-    mutt_set_parameter ("x-action", "pgp-signed", &b->parameter);
+    parameter_setval(&b->parameter, "x-action", "pgp-signed");
   else if (key)
-    mutt_set_parameter ("x-action", "pgp-keys", &b->parameter);
+    parameter_setval(&b->parameter, "x-action", "pgp-keys");
 
   return 1;
 }
@@ -914,7 +889,7 @@ int pgp_encrypted_handler (BODY * a, STATE * s)
       state_attach_puts (_("[-- End of PGP/MIME encrypted data --]\n"), s);
     }
 
-    mutt_free_body (&tattach);
+    body_list_wipe(&tattach);
     /* clear 'Invoking...' message, since there's no error */
     mutt_message _("PGP message successfully decrypted.");
   } else {
@@ -1023,21 +998,21 @@ BODY *pgp_sign_message (BODY * a)
     return (NULL);              /* fatal error while signing */
   }
 
-  t = mutt_new_body ();
+  t = body_new();
   t->type = TYPEMULTIPART;
   t->subtype = m_strdup("signed");
   t->encoding = ENC7BIT;
   t->use_disp = 0;
   t->disposition = DISPINLINE;
 
-  mutt_generate_boundary (&t->parameter);
-  mutt_set_parameter ("protocol", "application/pgp-signature", &t->parameter);
-  mutt_set_parameter ("micalg", pgp_micalg (sigfile), &t->parameter);
+  parameter_set_boundary(&t->parameter);
+  parameter_setval(&t->parameter, "protocol", "application/pgp-signature");
+  parameter_setval(&t->parameter, "micalg", pgp_micalg (sigfile));
 
   t->parts = a;
   a = t;
 
-  t->parts->next = mutt_new_body ();
+  t->parts->next = body_new();
   t = t->parts->next;
   t->type = TYPEAPPLICATION;
   t->subtype = m_strdup("pgp-signature");
@@ -1103,7 +1078,7 @@ char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
   if (fqdn)
     rfc822_qualify (tmp, fqdn);
 
-  tmp = mutt_remove_duplicates (tmp);
+  address_list_uniq(&tmp);
 
   for (p = tmp; p; p = p->next) {
     char buf[LONG_STRING];
@@ -1269,22 +1244,22 @@ BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
     return (NULL);
   }
 
-  t = mutt_new_body ();
+  t = body_new();
   t->type = TYPEMULTIPART;
   t->subtype = m_strdup("encrypted");
   t->encoding = ENC7BIT;
   t->use_disp = 0;
   t->disposition = DISPINLINE;
 
-  mutt_generate_boundary (&t->parameter);
-  mutt_set_parameter ("protocol", "application/pgp-encrypted", &t->parameter);
+  parameter_set_boundary(&t->parameter);
+  parameter_setval(&t->parameter, "protocol", "application/pgp-encrypted");
 
-  t->parts = mutt_new_body ();
+  t->parts = body_new();
   t->parts->type = TYPEAPPLICATION;
   t->parts->subtype = m_strdup("pgp-encrypted");
   t->parts->encoding = ENC7BIT;
 
-  t->parts->next = mutt_new_body ();
+  t->parts->next = body_new();
   t->parts->next->type = TYPEAPPLICATION;
   t->parts->next->subtype = m_strdup("octet-stream");
   t->parts->next->encoding = ENC7BIT;
@@ -1437,30 +1412,19 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
     return NULL;
   }
 
-  b = mutt_new_body ();
+  b = body_new();
 
   b->encoding = ENC7BIT;
 
   b->type = TYPETEXT;
   b->subtype = m_strdup("plain");
 
-  mutt_set_parameter ("x-action",
-                      flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed",
-                      &b->parameter);
-  mutt_set_parameter ("charset", send_charset, &b->parameter);
+  parameter_setval(&b->parameter, "x-action",
+                   flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed");
+  parameter_setval(&b->parameter, "charset", send_charset);
 
   b->filename = m_strdup(pgpoutfile);
 
-#if 0
-  /* The following is intended to give a clue to some completely brain-dead 
-   * "mail environments" which are typically used by large corporations.
-   */
-
-  b->d_filename = m_strdup("msg.pgp");
-  b->use_disp = 1;
-
-#endif
-
   b->disposition = DISPINLINE;
   b->unlink = 1;