X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=smime.c;h=ae7a995e3cfa2414fb17ffefd5e10178fd6150ec;hb=692cf062e86570a73f9147e09f017ccec378be58;hp=afa7be4e3301e8a55a2821c9881705231ad452d2;hpb=bbc4fd52516a8afefbd14c77e34f8389d6f0a6ed;p=apps%2Fmadmutt.git

diff --git a/smime.c b/smime.c
index afa7be4..ae7a995 100644
--- a/smime.c
+++ b/smime.c
@@ -106,7 +106,7 @@ int smime_valid_passphrase (void)
 
   smime_void_passphrase ();
 
-  if (mutt_get_field_unbuffered (_("Enter SMIME passphrase:"), SmimePass,
+  if (mutt_get_field_unbuffered (_("Enter S/MIME passphrase:"), SmimePass,
                                  sizeof (SmimePass), M_PASS) == 0) {
     SmimeExptime = time (NULL) + SmimeTimeout;
     return (1);
@@ -1861,11 +1861,9 @@ bail:
 }
 
 
-void smime_application_smime_handler (BODY * m, STATE * s)
+int smime_application_smime_handler (BODY * m, STATE * s)
 {
-
-  smime_handle_entity (m, s, NULL);
-
+  return smime_handle_entity (m, s, NULL) ? 0 : -1;
 }
 
 int smime_send_menu (HEADER * msg, int *redraw)
@@ -1887,8 +1885,9 @@ int smime_send_menu (HEADER * msg, int *redraw)
   case 3:                      /* encrypt (w)ith */
     msg->security |= ENCRYPT;
     switch (mutt_multi_choice (_("1: DES, 2: Triple-DES, 3: RC2-40,"
-                                 " 4: RC2-64, 5: RC2-128, or (f)orget it? "),
-                               _("12345f"))) {
+                                 " 4: RC2-64, 5: RC2-128, 6: AES128,"
+                                 " 7: AES192, 8: AES256, or (f)orget it? "),
+                               _("12345678f"))) {
     case 1:
       str_replace (&SmimeCryptAlg, "des");
       break;
@@ -1904,7 +1903,16 @@ int smime_send_menu (HEADER * msg, int *redraw)
     case 5:
       str_replace (&SmimeCryptAlg, "rc2-128");
       break;
-    case 6:                    /* forget it */
+    case 6:
+      str_replace (&SmimeCryptAlg, "aes128");
+      break;
+    case 7:
+      str_replace (&SmimeCryptAlg, "aes192");
+      break;
+    case 8:
+      str_replace (&SmimeCryptAlg, "aes256");
+      break;
+    case 9: /* forget it */
       break;
     }
     break;
@@ -1923,7 +1931,6 @@ int smime_send_menu (HEADER * msg, int *redraw)
   case 4:                      /* sign (a)s */
 
     if ((p = smime_ask_for_key (_("Sign as: "), NULL, 0))) {
-      p[str_len (p) - 1] = '\0';
       str_replace (&SmimeDefaultKey, p);
 
       msg->security |= SIGN;