remove a mutt-ng thing that makes no sense at all.

[apps/madmutt.git] / lib-crypt / pgp.c

diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c
index 94bf553..3c3e0f7 100644 (file)
--- a/lib-crypt/pgp.c
+++ b/lib-crypt/pgp.c
@@ -130,7 +130,7 @@ static int pgp_copy_checksig (FILE * fpin, FILE * fpout)
         rv = 0;
       }
 
-      if (strncmp (line, "[GNUPG:] ", 9) == 0)
+      if (m_strncmp (line, "[GNUPG:] ", 9) == 0)
         continue;
       fputs (line, fpout);
       fputc ('\n', fpout);
@@ -595,7 +595,7 @@ static void pgp_extract_keys_from_attachment (FILE * fp, BODY * top)
 
   tempfp = m_tempfile(tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
   if (tempfp == NULL) {
-    mutt_perror (tempfname);
+    mutt_perror (_("Can't create temporary file"));
     return;
   }
 
@@ -758,7 +758,7 @@ int pgp_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
   s.fpin = fpin;
   *fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
   if (*fpout == NULL) {
-    mutt_perror (tempfile);
+    mutt_perror (_("Can't create temporary file"));
     return (-1);
   }
   unlink (tempfile);
@@ -974,7 +974,7 @@ BODY *pgp_sign_message (BODY * a)
 static short is_numerical_keyid (const char *s)
 {
   /* or should we require the "0x"? */
-  if (strncmp (s, "0x", 2) == 0)
+  if (m_strncmp (s, "0x", 2) == 0)
     s += 2;
   if (m_strlen(s) % 8)
     return 0;
@@ -1040,7 +1040,7 @@ char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
                 p->mailbox);
       if ((r = mutt_yesorno (buf, M_YES)) == M_YES) {
         if (is_numerical_keyid (keyID)) {
-          if (strncmp (keyID, "0x", 2) == 0)
+          if (m_strncmp (keyID, "0x", 2) == 0)
             keyID += 2;
           goto bypass_selection;        /* you don't see this. */
         }
@@ -1115,7 +1115,7 @@ BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
 
   fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
   if (fpout == NULL) {
-    mutt_perror (tempfile);
+    mutt_perror (_("Can't create temporary file"));
     return (NULL);
   }
 
@@ -1426,11 +1426,6 @@ int pgp_send_menu (HEADER * msg, int *redraw)
 
       crypt_pgp_void_passphrase ();     /* probably need a different passphrase */
     }
-#if 0
-    else {
-      msg->security &= ~SIGN;
-    }
-#endif
 
     *redraw = REDRAW_FULL;
     break;