X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fcrypt.c;h=3ee7853c3ca47aefa786de2e720add68c7a55be3;hp=66e95885b2c9af22912795f90b75e77bc0387a1c;hb=6790552986464d9ad4be03f361a332441b0f08eb;hpb=774b53097f8c8b62c5101bce8f313d339387a438;ds=sidebyside

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 66e9588..3ee7853 100644
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -12,45 +12,28 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
+#include <lib-lib/lib-lib.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 <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
-
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
 
-#include "mutt.h"
 #include "alias.h"
 #include "handler.h"
 #include "copy.h"
 #include "crypt.h"
 #include "pgp.h"
 
+static int crypt_write_signed (BODY *, STATE *, FILE *);
+
 /* print the current time to avoid spoofing of the signature output */
 void crypt_current_time (STATE * s, const char *app_name)
 {
@@ -284,18 +267,12 @@ int crypt_query (BODY * m)
 }
 
 
-int crypt_write_signed (BODY * a, STATE * s, const char *tempfile)
+static int crypt_write_signed (BODY * a, STATE * s, FILE *fp)
 {
-  FILE *fp;
   int c;
   short hadcr;
   size_t bytes;
 
-  if (!(fp = safe_fopen (tempfile, "w"))) {
-    mutt_perror (tempfile);
-    return -1;
-  }
-
   fseeko (s->fpin, a->hdr_offset, 0);
   bytes = a->length + a->offset - a->hdr_offset;
   hadcr = 0;
@@ -360,9 +337,9 @@ void crypt_extract_keys_from_messages (HEADER * h)
   address_t *tmp = NULL;
   FILE *fpout;
 
-  mutt_mktemp (tempfname);
-  if (!(fpout = safe_fopen (tempfname, "w"))) {
-    mutt_perror (tempfname);
+  fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
+  if (!fpout) {
+    mutt_error(_("Could not create temporary file"));
     return;
   }
 
@@ -508,6 +485,7 @@ static void crypt_fetch_signatures (BODY ***signatures, BODY * a, int *n)
 int mutt_signed_handler (BODY * a, STATE * s)
 {
   char tempfile[_POSIX_PATH_MAX];
+  FILE * tempfp;
   char *protocol;
   int protocol_major = TYPEOTHER;
   char *protocol_minor = NULL;
@@ -568,30 +546,35 @@ int mutt_signed_handler (BODY * a, STATE * s)
     crypt_fetch_signatures (&signatures, a->next, &sigcnt);
 
     if (sigcnt) {
-      mutt_mktemp (tempfile);
-      if (crypt_write_signed (a, s, tempfile) == 0) {
-        for (i = 0; i < sigcnt; i++) {
-          if (signatures[i]->type == TYPEAPPLICATION
-              && !m_strcasecmp(signatures[i]->subtype, "pgp-signature")) {
-            if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
-              goodsig = 0;
-
-            continue;
-          }
-
-          if (signatures[i]->type == TYPEAPPLICATION
-          && (!m_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
-               || !m_strcasecmp(signatures[i]->subtype, "pkcs7-signature")))
-          {
-            if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
-              goodsig = 0;
-
-            continue;
-          }
-
-          state_printf (s, _("[-- Warning: "
-                             "We can't verify %s/%s signatures. --]\n\n"),
-                        TYPE (signatures[i]), signatures[i]->subtype);
+      tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+      if (!tempfp) {
+            mutt_perror (tempfile);
+      }
+      else {
+        if (crypt_write_signed (a, s, tempfp) == 0) {
+          for (i = 0; i < sigcnt; i++) {
+            if (signatures[i]->type == TYPEAPPLICATION
+                && !m_strcasecmp(signatures[i]->subtype, "pgp-signature")) {
+              if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
+                goodsig = 0;
+
+              continue;
+            }
+
+            if (signatures[i]->type == TYPEAPPLICATION
+            && (!m_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
+                 || !m_strcasecmp(signatures[i]->subtype, "pkcs7-signature")))
+            {
+              if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
+                goodsig = 0;
+
+              continue;
+            }
+
+            state_printf (s, _("[-- Warning: "
+                               "We can't verify %s/%s signatures. --]\n\n"),
+                          TYPE (signatures[i]), signatures[i]->subtype);
+         }
         }
       }