X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fsmime.c;h=1248f31bf86f55abeee024417fc37980c616399c;hb=fc854762626c5e2dce8c5618860a882934ec81d2;hp=f5700a2ff983a687248eb61b596d32d2bb2bbb0e;hpb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index f5700a2..1248f31 100644
--- a/lib-crypt/smime.c
+++ b/lib-crypt/smime.c
@@ -404,12 +404,12 @@ char *smime_ask_for_key (char *prompt, char *mailbox __attribute__((unused)),
     /* Make Helpstring */
     helpstr[0] = 0;
     mutt_make_help (buf, sizeof (buf), _("Exit  "), MENU_SMIME, OP_EXIT);
-    strcat (helpstr, buf);      /* __STRCAT_CHECKED__ */
+    m_strcat(helpstr, sizeof(helpstr), buf);
     mutt_make_help (buf, sizeof (buf), _("Select  "), MENU_SMIME,
                     OP_GENERIC_SELECT_ENTRY);
-    strcat (helpstr, buf);      /* __STRCAT_CHECKED__ */
+    m_strcat(helpstr, sizeof(helpstr), buf);
     mutt_make_help (buf, sizeof (buf), _("Help"), MENU_SMIME, OP_HELP);
-    strcat (helpstr, buf);      /* __STRCAT_CHECKED__ */
+    m_strcat(helpstr, sizeof(helpstr), buf);
 
     /* Create the menu */
     menu = mutt_new_menu ();
@@ -754,7 +754,7 @@ char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
 
     keylist_size += m_strlen(keyID) + 2;
     p_realloc(&keylist, keylist_size);
-    sprintf (keylist + keylist_used, "%s\n", keyID);    /* __SPRINTF_CHECKED__ */
+    sprintf (keylist + keylist_used, "%s\n", keyID);
     keylist_used = m_strlen(keylist);
 
     address_list_wipe(&addr);
@@ -1087,7 +1087,7 @@ int smime_verify_sender (HEADER * h)
 
   fpout = m_tempfile (tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
   if (!fpout) {
-    mutt_perror (tempfname);
+    mutt_perror (_("Can't create temporary file"));
     return 1;
   }
 
@@ -1187,7 +1187,7 @@ BODY *smime_build_smime_entity (BODY * a, char *certlist)
 
   fpout = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
   if (!fpout) {
-    mutt_perror (tempfile);
+    mutt_perror (_("Can't create temporary file"));
     return NULL;
   }
 
@@ -1769,7 +1769,7 @@ int smime_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
 
   tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
   if (!tmpfp) {
-    mutt_perror (tempfile);
+    mutt_perror (_("Can't create temporary file"));
     return (-1);
   }
 
@@ -1785,7 +1785,7 @@ int smime_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
 
   *fpout = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
   if (!*fpout) {
-    mutt_perror (tempfile);
+    mutt_perror (_("Can't create temporary file"));
     rv = -1;
     goto bail;
   }
@@ -1912,10 +1912,6 @@ int smime_send_menu (HEADER * msg, int *redraw)
       /* probably need a different passphrase */
       crypt_smime_void_passphrase ();
     }
-#if 0
-    else
-      msg->security &= ~SIGN;
-#endif
 
     *redraw = REDRAW_FULL;
     break;