X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fcrypt.c;h=f2e0178a549d2d796513f5d679af7cf20adf1ab2;hp=730c455081906fd6013ac96b1e0ccd711d7ae43e;hb=d795d156dff537b76d8e59df5653f199ad06e5b4;hpb=64a23f5574b096605383ef1886c7d0d6c42aeeee

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 730c455..f2e0178 100644
--- 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);
 }