X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fcrypt-gpgme.c;h=29a676e0b57ef065e81d2894a63a8aee4a253fa6;hp=accd171786d04cac7833598a47501f262f341316;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9

diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index accd171..29a676e 100644
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -12,18 +12,21 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #ifdef CRYPT_BACKEND_GPGME
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/debug.h>
+#ifdef HAVE_LOCALE_H
+#  include <locale.h>
+#endif
+#ifdef HAVE_LANGINFO_D_T_FMT
+#  include <langinfo.h>
+#endif
+#ifdef HAVE_SYS_RESOURCE_H
+#  include <sys/resource.h>
+#endif
+
+#include <gpgme.h>
 
 #include <lib-mime/mime.h>
 
@@ -31,39 +34,15 @@
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 
-#include "mutt.h"
+#include "lib.h"
+#include "alias.h"
 #include <lib-crypt/crypt.h>
 #include "handler.h"
 #include "copy.h"
 #include "pager.h"
 #include "recvattach.h"
 #include "sort.h"
-
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include <gpgme.h>
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#ifdef HAVE_LANGINFO_D_T_FMT
-#include <langinfo.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif
+#include "crypt-gpgme.h"
 
 /*
  * Helper macros.
@@ -369,10 +348,9 @@ static gpgme_data_t body_to_data_object (BODY * a, int convert)
   int err = 0;
   gpgme_data_t data;
 
-  mutt_mktemp (tempfile);
-  fptmp = safe_fopen (tempfile, "w+");
+  fptmp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
   if (!fptmp) {
-    mutt_perror (tempfile);
+    mutt_perror (_("Can't create temporary file"));
     return NULL;
   }
 
@@ -401,13 +379,11 @@ static gpgme_data_t body_to_data_object (BODY * a, int convert)
       buf[0] = c;
       gpgme_data_write (data, buf, 1);
     }
-    fclose (fptmp);
     gpgme_data_seek (data, 0, SEEK_SET);
-  }
-  else {
-    fclose (fptmp);
+  } else {
     err = gpgme_data_new_from_file (&data, tempfile, 1);
   }
+  m_fclose(&fptmp);
   unlink (tempfile);
   if (err) {
     mutt_error (_("error allocating data object: %s\n"), gpgme_strerror (err));
@@ -478,10 +454,9 @@ static char *data_object_to_tempfile (gpgme_data_t data, FILE ** ret_fp)
   FILE *fp;
   ssize_t nread = 0;
 
-  mutt_mktemp (tempfile);
-  fp = safe_fopen (tempfile, "w+");
+  fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
   if (!fp) {
-    mutt_perror (tempfile);
+    mutt_perror (_("Can't create temporary file"));
     return NULL;
   }
 
@@ -493,7 +468,7 @@ static char *data_object_to_tempfile (gpgme_data_t data, FILE ** ret_fp)
     while ((nread = gpgme_data_read (data, buf, sizeof (buf)))) {
       if (fwrite (buf, nread, 1, fp) != 1) {
         mutt_perror (tempfile);
-        fclose (fp);
+        m_fclose(&fp);
         unlink (tempfile);
         return NULL;
       }
@@ -502,11 +477,11 @@ static char *data_object_to_tempfile (gpgme_data_t data, FILE ** ret_fp)
   if (ret_fp)
     rewind (fp);
   else
-    fclose (fp);
+    m_fclose(&fp);
   if (nread == -1) {
     mutt_error (_("error reading data object: %s\n"), gpgme_strerror (err));
     unlink (tempfile);
-    fclose (fp);
+    m_fclose(&fp);
     return NULL;
   }
   if (ret_fp)
@@ -760,34 +735,34 @@ static BODY *sign_message (BODY * a, int use_smime)
     return NULL;
   }
 
-  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",
-                      use_smime ? "application/pkcs7-signature"
-                      : "application/pgp-signature", &t->parameter);
+  parameter_set_boundary(&t->parameter);
+  parameter_setval(&t->parameter, "protocol",
+                   use_smime ? "application/pkcs7-signature"
+                             : "application/pgp-signature");
   /* Get the micalg from gpgme.  Old gpgme versions don't support this
      for S/MIME so we assume sha-1 in this case. */
   if (!get_micalg (ctx, buf, sizeof buf))
-    mutt_set_parameter ("micalg", buf, &t->parameter);
+    parameter_setval(&t->parameter, "micalg", buf);
   else if (use_smime)
-    mutt_set_parameter ("micalg", "sha1", &t->parameter);
+    parameter_setval(&t->parameter, "micalg", "sha1");
   gpgme_release (ctx);
 
   t->parts = a;
   a = t;
 
-  t->parts->next = mutt_new_body ();
+  t->parts->next = body_new();
   t = t->parts->next;
   t->type = TYPEAPPLICATION;
   if (use_smime) {
     t->subtype = m_strdup("pkcs7-signature");
-    mutt_set_parameter ("name", "smime.p7s", &t->parameter);
+    parameter_setval(&t->parameter, "name", "smime.p7s");
     t->encoding = ENCBASE64;
     t->use_disp = 1;
     t->disposition = DISPATTACH;
@@ -847,22 +822,22 @@ BODY *pgp_gpgme_encrypt_message (BODY * a, char *keylist, int sign)
   if (!outfile)
     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;
@@ -905,11 +880,11 @@ BODY *smime_gpgme_build_smime_entity (BODY * a, char *keylist)
   if (!outfile)
     return NULL;
 
-  t = mutt_new_body ();
+  t = body_new();
   t->type = TYPEAPPLICATION;
   t->subtype = m_strdup("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;
@@ -1316,7 +1291,6 @@ static int verify_one (BODY * sigbdy, STATE * s,
   gpgme_release (ctx);
 
   state_attach_puts (_("[-- End signature information --]\n\n"), s);
-  debug_print (1, ("returning %d.\n", badsig));
 
   return badsig ? 1 : anywarn ? 2 : 0;
 }
@@ -1491,9 +1465,9 @@ int pgp_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
 
   p_clear(&s, 1);
   s.fpin = fpin;
-  mutt_mktemp (tempfile);
-  if (!(*fpout = safe_fopen (tempfile, "w+"))) {
-    mutt_perror (tempfile);
+  *fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  if (!*fpout) {
+    mutt_perror (_("Can't create temporary file"));
     return -1;
   }
   unlink (tempfile);
@@ -1536,9 +1510,9 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
   p_clear(&s, 1);
   s.fpin = fpin;
   fseeko (s.fpin, b->offset, 0);
-  mutt_mktemp (tempfile);
-  if (!(tmpfp = safe_fopen (tempfile, "w+"))) {
-    mutt_perror (tempfile);
+  tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  if (!tmpfp) {
+    mutt_perror (_("Can't create temporary file"));
     return -1;
   }
   mutt_unlink (tempfile);
@@ -1553,9 +1527,9 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
   p_clear(&s, 1);
   s.fpin = tmpfp;
   s.fpout = 0;
-  mutt_mktemp (tempfile);
-  if (!(*fpout = safe_fopen (tempfile, "w+"))) {
-    mutt_perror (tempfile);
+  *fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  if (!*fpout) {
+    mutt_perror (_("Can't create temporary file"));
     return -1;
   }
   mutt_unlink (tempfile);
@@ -1566,7 +1540,7 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
   b->type = saved_b_type;
   b->length = saved_b_length;
   b->offset = saved_b_offset;
-  fclose (tmpfp);
+  m_fclose(&tmpfp);
   rewind (*fpout);
   if (*cur && !is_signed && !(*cur)->parts
       && mutt_is_application_smime (*cur)) {
@@ -1588,9 +1562,9 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
     p_clear(&s, 1);
     s.fpin = *fpout;
     fseeko (s.fpin, bb->offset, 0);
-    mutt_mktemp (tempfile);
-    if (!(tmpfp = safe_fopen (tempfile, "w+"))) {
-      mutt_perror (tempfile);
+    tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+    if (!tmpfp) {
+      mutt_perror (_("Can't create temporary file"));
       return -1;
     }
     mutt_unlink (tempfile);
@@ -1601,14 +1575,14 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
     bb->length = ftello (s.fpout);
     bb->offset = 0;
     rewind (tmpfp);
-    fclose (*fpout);
+    m_fclose(&*fpout);
 
     p_clear(&s, 1);
     s.fpin = tmpfp;
     s.fpout = 0;
-    mutt_mktemp (tempfile);
-    if (!(*fpout = safe_fopen (tempfile, "w+"))) {
-      mutt_perror (tempfile);
+    *fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+    if (!*fpout) {
+      mutt_perror (_("Can't create temporary file"));
       return -1;
     }
     mutt_unlink (tempfile);
@@ -1619,9 +1593,9 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
     bb->type = saved_b_type;
     bb->length = saved_b_length;
     bb->offset = saved_b_offset;
-    fclose (tmpfp);
+    m_fclose(&tmpfp);
     rewind (*fpout);
-    mutt_free_body (cur);
+    body_list_wipe(cur);
     *cur = tmp_b;
   }
   return *cur ? 0 : -1;
@@ -1667,7 +1641,7 @@ static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
         sgn = 1;
     }
   }
-  safe_fclose (&tfp);
+  m_fclose(&tfp);
   unlink (tempfile);
 
   if (!enc && !sgn)
@@ -1675,10 +1649,9 @@ static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
 
   /* fix the content type */
 
-  mutt_set_parameter ("format", "fixed", &b->parameter);
-  mutt_set_parameter ("x-action", enc ? "pgp-encrypted" : "pgp-signed",
-                      &b->parameter);
-
+  parameter_setval(&b->parameter, "format", "fixed");
+  parameter_setval(&b->parameter, "x-action",
+                   enc ? "pgp-encrypted" : "pgp-signed");
   return 1;
 }
 
@@ -1721,7 +1694,7 @@ static void copy_clearsigned (gpgme_data_t data, STATE * s, char *charset)
 {
   char buf[HUGE_STRING];
   short complete, armor_header;
-  FGETCONV *fc;
+  fgetconv_t *fc;
   char *fname;
   FILE *fp;
 
@@ -1761,7 +1734,7 @@ static void copy_clearsigned (gpgme_data_t data, STATE * s, char *charset)
   }
 
   fgetconv_close (&fc);
-  fclose (fp);
+  m_fclose(&fp);
 }
 
 
@@ -1784,8 +1757,6 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s)
 
   char body_charset[STRING];    /* Only used for clearsigned messages. */
 
-  debug_print (2, ("Entering pgp_application_pgp handler\n"));
-
   /* For clearsigned messages we won't be able to get a character set
      but we know that this may only be text thus we assume Latin-1
      here. */
@@ -1947,7 +1918,7 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s)
         copy_clearsigned (armored_data, s, body_charset);
       }
       else if (pgpout) {
-        FGETCONV *fc;
+        fgetconv_t *fc;
         int c;
 
         rewind (pgpout);
@@ -1971,7 +1942,7 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s)
       }
 
       if (pgpout) {
-        safe_fclose (&pgpout);
+        m_fclose(&pgpout);
       }
     }
     else {
@@ -1989,7 +1960,6 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s)
                          " of PGP message! --]\n\n"), s);
     return (-1);
   }
-  debug_print (2, ("Leaving pgp_application_pgp handler\n"));
   return (err);
 }
 
@@ -2007,7 +1977,6 @@ int pgp_gpgme_encrypted_handler (BODY * a, STATE * s)
   int is_signed;
   int rc = 0;
 
-  debug_print (2, ("Entering pgp_encrypted handler\n"));
   a = a->parts;
   if (!a || a->type != TYPEAPPLICATION || !a->subtype
       || ascii_strcasecmp ("pgp-encrypted", a->subtype)
@@ -2022,8 +1991,8 @@ int pgp_gpgme_encrypted_handler (BODY * a, STATE * s)
   /* Move forward to the application/pgp-encrypted body. */
   a = a->next;
 
-  mutt_mktemp (tempfile);
-  if (!(fpout = safe_fopen (tempfile, "w+"))) {
+  fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  if (!fpout) {
     if (s->flags & M_DISPLAY)
       state_attach_puts (_("[-- Error: could not create temporary file! "
                            "--]\n"), s);
@@ -2064,12 +2033,11 @@ int pgp_gpgme_encrypted_handler (BODY * a, STATE * s)
                          : _("[-- End of PGP/MIME encrypted data --]\n"), s);
     }
 
-    mutt_free_body (&tattach);
+    body_list_wipe(&tattach);
   }
 
-  fclose (fpout);
+  m_fclose(&fpout);
   mutt_unlink (tempfile);
-  debug_print (2, ("Leaving pgp_encrypted handler\n"));
   return (rc);
 }
 
@@ -2082,11 +2050,9 @@ int smime_gpgme_application_handler (BODY * a, STATE * s)
   int is_signed;
   int rc = 0;
 
-  debug_print (2, ("Entering smime_encrypted handler\n"));
-
   a->warnsig = 0;
-  mutt_mktemp (tempfile);
-  if (!(fpout = safe_fopen (tempfile, "w+"))) {
+  fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  if (!fpout) {
     if (s->flags & M_DISPLAY)
       state_attach_puts (_("[-- Error: could not create temporary file! "
                            "--]\n"), s);
@@ -2131,12 +2097,11 @@ int smime_gpgme_application_handler (BODY * a, STATE * s)
                          _("[-- End of S/MIME encrypted data --]\n"), s);
     }
 
-    mutt_free_body (&tattach);
+    body_list_wipe(&tattach);
   }
 
-  fclose (fpout);
+  m_fclose(&fpout);
   mutt_unlink (tempfile);
-  debug_print (2, ("Leaving smime_encrypted handler\n"));
   return (rc);
 }
 
@@ -2958,10 +2923,9 @@ static void verify_key (crypt_key_t * key)
   gpgme_key_t k = NULL;
   int maxdepth = 100;
 
-  mutt_mktemp (tempfile);
-  if (!(fp = safe_fopen (tempfile, "w"))) {
+  fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  if (!fp) {
     mutt_perror (_("Can't create temporary file"));
-
     return;
   }
   mutt_message _("Collecting data...");
@@ -3003,7 +2967,7 @@ static void verify_key (crypt_key_t * key)
 leave:
   gpgme_key_release (k);
   gpgme_release (listctx);
-  fclose (fp);
+  m_fclose(&fp);
   mutt_clear_error ();
   snprintf (cmd, sizeof (cmd), _("Key ID: 0x%s"), crypt_keyid (key));
   mutt_do_pager (cmd, tempfile, 0, NULL);
@@ -3455,13 +3419,8 @@ static crypt_key_t *crypt_getkeybyaddr (address_t * a, short abilities,
   if (!keys)
     return NULL;
 
-  debug_print (5, ("looking for %s <%s>.\n", a->personal, a->mailbox));
-
   for (k = keys; k; k = k->next) {
-    debug_print (5, ("  looking at key: %s `%.15s'\n", crypt_keyid (k), k->uid));
-
     if (abilities && !(k->flags & abilities)) {
-      debug_print (5, ("  insufficient abilities: Has %x, want %x\n", k->flags, abilities));
       continue;
     }
 
@@ -3539,7 +3498,7 @@ static crypt_key_t *crypt_getkeybyaddr (address_t * a, short abilities,
 }
 
 
-static crypt_key_t *crypt_getkeybystr (char *p, short abilities,
+static crypt_key_t *crypt_getkeybystr (const char *p, short abilities,
                                        unsigned int app, int *forced_valid)
 {
   string_list_t *hints = NULL;
@@ -3565,7 +3524,6 @@ static crypt_key_t *crypt_getkeybystr (char *p, short abilities,
       continue;
 
     match = 0;
-    debug_print (5, ("matching \"%s\" against " "key %s, \"%s\":\n", p, crypt_keyid (k), k->uid));
 
     if (!*p || !m_strcasecmp(p, crypt_keyid (k))
         || (!m_strncasecmp(p, "0x", 2)
@@ -3576,8 +3534,6 @@ static crypt_key_t *crypt_getkeybystr (char *p, short abilities,
         || m_stristr(k->uid, p)) {
       crypt_key_t *tmp;
 
-      debug_print (5, ("match.\n"));
-
       *matches_endp = tmp = crypt_copy_key (k);
       matches_endp = &tmp->next;
     }
@@ -3656,7 +3612,8 @@ static crypt_key_t *crypt_ask_for_key (char *tag,
 static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
                         unsigned int app)
 {
-  char *keyID, *keylist = NULL, *t;
+  char *keylist = NULL, *t;
+  const char *keyID;
   ssize_t keylist_size = 0;
   ssize_t keylist_used = 0;
   address_t *tmp = NULL, *addr = NULL;
@@ -3693,7 +3650,7 @@ static char *find_keys (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];
@@ -3716,13 +3673,8 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
           q = addr;
         }
         else {
-#if 0
-          k_info = crypt_getkeybystr (keyID, KEYFLAG_CANENCRYPT,
-                                      *r_application, &forced_valid);
-#else
           k_info = crypt_getkeybystr (keyID, KEYFLAG_CANENCRYPT,
                                       app, &forced_valid);
-#endif
         }
       }
       else if (r == -1) {
@@ -3739,11 +3691,7 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
       snprintf (buf, sizeof (buf), _("Enter keyID for %s: "), q->mailbox);
 
       if ((key = crypt_ask_for_key (buf, q->mailbox, KEYFLAG_CANENCRYPT,
-#if 0
-                                    *r_application,
-#else
                                     app,
-#endif
                                     &forced_valid)) == NULL) {
         p_delete(&keylist);
         address_list_wipe(&tmp);
@@ -3757,13 +3705,6 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
     {
       const char *s = crypt_fpr (key);
 
-#if 0
-      if (key->flags & KEYFLAG_ISX509)
-        *r_application &= ~APPLICATION_PGP;
-      if (!(key->flags & KEYFLAG_ISX509))
-        *r_application &= ~APPLICATION_SMIME;
-#endif
-
       keylist_size += m_strlen(s) + 4 + 1;
       p_realloc(&keylist, keylist_size);
       sprintf (keylist + keylist_used, "%s0x%s%s",      /* __SPRINTF_CHECKED__ */
@@ -3857,11 +3798,6 @@ static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
 
       msg->security |= (is_smime ? SMIMESIGN : PGPSIGN);
     }
-#if 0
-    else {
-      msg->security &= (is_smime ? ~SMIMESIGN : ~PGPSIGN);
-    }
-#endif
     *redraw = REDRAW_FULL;
     break;