From 6790552986464d9ad4be03f361a332441b0f08eb Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Sat, 25 Nov 2006 00:46:11 +0100
Subject: [PATCH] Use m_tempfile instead of mutt_mktemp

And crypt_write is static

Signed-off-by: Julien Danjou <julien@danjou.info>
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---
 lib-crypt/crypt.c | 64 ++++++++++++++++++++++++-----------------------
 lib-crypt/crypt.h |  5 ----
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index b133add..3ee7853 100644
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -32,6 +32,8 @@
 #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)
 {
@@ -265,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;
@@ -489,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;
@@ -549,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);
+         }
         }
       }
 
diff --git a/lib-crypt/crypt.h b/lib-crypt/crypt.h
index 274fbfa..f9dc9a7 100644
--- a/lib-crypt/crypt.h
+++ b/lib-crypt/crypt.h
@@ -112,11 +112,6 @@ void crypt_forget_passphrase (void);
 /* Check that we have a usable passphrase, ask if not. */
 int crypt_valid_passphrase (int);
 
-/* Write the message body/part A described by state S to a the given
-   TEMPFILE.  */
-int crypt_write_signed (BODY * a, STATE * s, const char *tempf);
-
-
 
 /*-- cryptglue.c --*/
 
-- 
2.20.1