refactor import_keys to take directly an open file.

use tmpfile to generate the temp FILE*

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/init.h b/init.h
index b4bd6a2..587b6fe 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1618,15 +1618,6 @@ struct option_t MuttVars[] = {
    ** to find out whether an encrypted message is also signed.
    ** (Crypto only)
    */
-  {"crypt_timestamp", DT_BOOL, R_NONE, OPTCRYPTTIMESTAMP, "yes" },
-  /*
-   ** .pp
-   ** If \fIset\fP, Madmutt will include a time stamp in the lines surrounding
-   ** PGP or S/MIME output, so spoofing such lines is more difficult.
-   ** If you are using colors to mark these lines, and rely on these,
-   ** you may \fIunset\fP this setting.
-   ** (Crypto only)
-   */
   {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, "yes" },
   /*
    ** .pp

diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index aac1f10..d17abb8 100644 (file)
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -14,16 +14,6 @@
 
 #include <lib-lib/lib-lib.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>
@@ -3871,13 +3861,13 @@ int crypt_smime_verify_sender (HEADER * h)
   return ret;
 }
 
-static void invoke_import(const char *fname, int smime)
+void crypt_invoke_import(FILE *stream, int smime)
 {
     gpgme_ctx_t ctx = create_gpgme_context(smime);
     gpgme_data_t data;
     gpgme_error_t err;
 
-    err = gpgme_data_new_from_file(&data, fname, 1);
+    err = gpgme_data_new_from_stream(&data, stream);
     if (err) {
         mutt_error (_("error allocating data object: %s\n"), gpgme_strerror (err));
         gpgme_release(ctx);
@@ -3897,38 +3887,24 @@ static void invoke_import(const char *fname, int smime)
     return;
 }
 
-void crypt_pgp_invoke_import(const char *fname)
-{
-    invoke_import(fname, 0);
-}
-
-void crypt_smime_invoke_import(const char *fname)
-{
-    invoke_import(fname, 1);
-}
-
-static void pgp_extract_keys_from_attachment (FILE * fp, BODY * top)
+static void pgp_extract_keys_from_attachment(FILE * fp, BODY * top)
 {
-  STATE s;
-  FILE *tempfp;
-  char tempfname[_POSIX_PATH_MAX];
+    STATE s;
+    FILE *tmpfp = tmpfile();
 
-  tempfp = m_tempfile(tempfname, sizeof(tempfname), NONULL(MCore.tmpdir), NULL);
-  if (tempfp == NULL) {
-    mutt_perror (_("Can't create temporary file"));
-    return;
-  }
-
-  p_clear(&s, 1);
-
-  s.fpin = fp;
-  s.fpout = tempfp;
+    if (tmpfp == NULL) {
+        mutt_perror (_("Can't create temporary file"));
+        return;
+    }
 
-  mutt_body_handler (top, &s);
+    p_clear(&s, 1);
+    s.fpin  = fp;
+    s.fpout = tmpfp;
+    mutt_body_handler(top, &s);
 
-  m_fclose(&tempfp);
-  crypt_pgp_invoke_import(tempfname);
-  mutt_unlink (tempfname);
+    rewind(tmpfp);
+    crypt_invoke_import(tmpfp, 0);
+    m_fclose(&tmpfp);
 }
 
 void crypt_pgp_extract_keys_from_attachment_list(FILE * fp, int tag, BODY * top)

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 730c455..f2e0178 100644 (file)
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -14,15 +14,7 @@
 
 #include <lib-lib/lib-lib.h>
 
-#ifdef HAVE_LOCALE_H
-#  include <locale.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#  include <sys/resource.h>
-#endif
-
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
 #include <lib-mx/mx.h>
 
@@ -31,26 +23,6 @@
 #include "copy.h"
 #include "crypt.h"
 
-/* print the current time to avoid spoofing of the signature output */
-void crypt_current_time (STATE * s, const char *app_name)
-{
-  time_t t;
-  char p[STRING], tmp[STRING];
-
-  if (option (OPTCRYPTTIMESTAMP)) {
-    t = time (NULL);
-    setlocale (LC_TIME, "");
-    strftime (p, sizeof (p), _(" (current time: %c)"), localtime (&t));
-    setlocale (LC_TIME, "C");
-  }
-  else
-    *p = '\0';
-
-  snprintf (tmp, sizeof (tmp), _("[-- %s output follows%s --]\n"),
-            NONULL (app_name), p);
-  state_attach_puts (tmp, s);
-}
-
 int mutt_protect (HEADER * msg, char *keylist)
 {
   BODY *pbody = NULL, *tmp_pbody = NULL;
@@ -247,91 +219,57 @@ void convert_to_7bit (BODY * a)
 }
 
 
-void crypt_extract_keys_from_messages (HEADER * h)
+static void extract_keys_aux(FILE *fpout, HEADER *h)
 {
-  int i;
-  char tempfname[_POSIX_PATH_MAX];
-  address_t *tmp = NULL;
-  FILE *fpout;
-
-  fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(MCore.tmpdir), NULL);
-  if (!fpout) {
-    mutt_error(_("Could not create temporary file"));
-    return;
-  }
-
-  set_option (OPTDONTHANDLEPGPKEYS);
-
-  if (!h) {
-    for (i = 0; i < Context->vcount; i++) {
-      if (Context->hdrs[Context->v2r[i]]->tagged) {
-        mutt_parse_mime_message (Context, Context->hdrs[Context->v2r[i]]);
-        if (Context->hdrs[Context->v2r[i]]->security & APPLICATION_PGP) {
-          mutt_copy_message (fpout, Context, Context->hdrs[Context->v2r[i]],
-                             M_CM_DECODE | M_CM_CHARCONV, 0);
-          fflush (fpout);
-
-          mutt_endwin (_("Trying to extract PGP keys...\n"));
-          crypt_pgp_invoke_import (tempfname);
-        }
-
-        if (Context->hdrs[Context->v2r[i]]->security & APPLICATION_SMIME) {
-          if (Context->hdrs[Context->v2r[i]]->security & ENCRYPT)
-            mutt_copy_message (fpout, Context, Context->hdrs[Context->v2r[i]],
-                               M_CM_NOHEADER | M_CM_DECODE_CRYPT
-                               | M_CM_DECODE_SMIME, 0);
-          else
-            mutt_copy_message (fpout, Context,
-                               Context->hdrs[Context->v2r[i]], 0, 0);
-          fflush (fpout);
-
-          if (Context->hdrs[Context->v2r[i]]->env->from)
-            tmp = mutt_expand_aliases (h->env->from);
-          else if (Context->hdrs[Context->v2r[i]]->env->sender)
-            tmp = mutt_expand_aliases (Context->hdrs[Context->v2r[i]]
-                                       ->env->sender);
-          mutt_endwin (_("Trying to extract S/MIME certificates...\n"));
-          crypt_smime_invoke_import(tempfname);
-          tmp = NULL;
-        }
-
-        rewind (fpout);
-      }
-    }
-  }
-  else {
     mutt_parse_mime_message (Context, h);
+
+    rewind(fpout);
     if (h->security & APPLICATION_PGP) {
-      mutt_copy_message (fpout, Context, h, M_CM_DECODE | M_CM_CHARCONV, 0);
-      fflush (fpout);
-      mutt_endwin (_("Trying to extract PGP keys...\n"));
-      crypt_pgp_invoke_import (tempfname);
+        mutt_copy_message(fpout, Context, h, M_CM_DECODE | M_CM_CHARCONV, 0);
+        fflush (fpout);
+
+        mutt_endwin (_("Trying to extract PGP keys...\n"));
     }
 
     if (h->security & APPLICATION_SMIME) {
-      if (h->security & ENCRYPT)
-        mutt_copy_message (fpout, Context, h, M_CM_NOHEADER
-                           | M_CM_DECODE_CRYPT | M_CM_DECODE_SMIME, 0);
-      else
-        mutt_copy_message (fpout, Context, h, 0, 0);
-
-      fflush (fpout);
-      if (h->env->from)
-        tmp = mutt_expand_aliases (h->env->from);
-      else if (h->env->sender)
-        tmp = mutt_expand_aliases (h->env->sender);
-      mutt_message (_("Trying to extract S/MIME certificates...\n"));
-      crypt_smime_invoke_import(tempfname);
+        if (h->security & ENCRYPT)
+            mutt_copy_message (fpout, Context, h, M_CM_NOHEADER
+                               | M_CM_DECODE_CRYPT | M_CM_DECODE_SMIME, 0);
+        else
+            mutt_copy_message(fpout, Context, h, 0, 0);
+        fflush (fpout);
+
+        mutt_message (_("Trying to extract S/MIME certificates...\n"));
     }
-  }
 
-  m_fclose(&fpout);
-  if (isendwin ())
-    mutt_any_key_to_continue (NULL);
+    rewind(fpout);
+    crypt_invoke_import(fpout, h->security & APPLICATION_SMIME);
+}
 
-  mutt_unlink (tempfname);
+void crypt_extract_keys_from_messages(HEADER * h)
+{
+    FILE *tmpfp = tmpfile();
+    if (!tmpfp) {
+        mutt_error(_("Could not create temporary file"));
+        return;
+    }
+
+    set_option(OPTDONTHANDLEPGPKEYS);
+    if (!h) {
+        int i;
+        for (i = 0; i < Context->vcount; i++) {
+            if (!Context->hdrs[Context->v2r[i]]->tagged)
+                continue;
+            extract_keys_aux(tmpfp, Context->hdrs[Context->v2r[i]]);
+        }
+    } else {
+        extract_keys_aux(tmpfp, h);
+    }
+    unset_option(OPTDONTHANDLEPGPKEYS);
+    m_fclose(&tmpfp);
 
-  unset_option (OPTDONTHANDLEPGPKEYS);
+    if (isendwin())
+        mutt_any_key_to_continue(NULL);
 }
 
 

diff --git a/lib-crypt/crypt.h b/lib-crypt/crypt.h
index 130daef..247232b 100644 (file)
--- a/lib-crypt/crypt.h
+++ b/lib-crypt/crypt.h
@@ -91,9 +91,6 @@ void convert_to_7bit (BODY *);
 
 /*-- crypt.c --*/
 
-/* Print the current time. */
-void crypt_current_time (STATE * s, const char *app_name);
-
 /* Check out the type of encryption used and set the cached status
    values if there are any. */
 int crypt_query (BODY * m);
@@ -154,8 +151,7 @@ BODY *crypt_pgp_sign_message (BODY * a);
    later.  This is necessary for $fcc_attach. */
 BODY *crypt_pgp_encrypt_message (BODY * a, char *keylist, int sign);
 
-/* Invoke the PGP command to import a key. */
-void crypt_pgp_invoke_import (const char *fname);
+void crypt_invoke_import(FILE *stream, int smime);
 
 int crypt_pgp_send_menu (HEADER * msg, int *redraw);
 
@@ -195,9 +191,6 @@ BODY *crypt_smime_sign_message (BODY * a);
 /* fixme: needs documentation. */
 BODY *crypt_smime_build_smime_entity (BODY * a, char *certlist);
 
-/* Add a certificate and update index file (externally). */
-void crypt_smime_invoke_import(const char *infile);
-
 int crypt_smime_send_menu (HEADER * msg, int *redraw);
 
 /* fixme: needs documentation */

diff --git a/mutt.h b/mutt.h
index 1e6498d..07eb436 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -341,7 +341,6 @@ enum {
   OPTCRYPTREPLYENCRYPT,
   OPTCRYPTREPLYSIGN,
   OPTCRYPTREPLYSIGNENCRYPTED,
-  OPTCRYPTTIMESTAMP,
   OPTSMIMEISDEFAULT,
   OPTASKCERTLABEL,
   OPTSDEFAULTDECRYPTKEY,