projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
smime.c
diff --git
a/smime.c
b/smime.c
index
0116684
..
ae7a995
100644
(file)
--- a/
smime.c
+++ b/
smime.c
@@
-14,6
+14,8
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "enter.h"
+#include "handler.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "smime.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "smime.h"
@@
-104,7
+106,7
@@
int smime_valid_passphrase (void)
smime_void_passphrase ();
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);
sizeof (SmimePass), M_PASS) == 0) {
SmimeExptime = time (NULL) + SmimeTimeout;
return (1);
@@
-1859,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)
}
int smime_send_menu (HEADER * msg, int *redraw)
@@
-1885,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,"
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;
case 1:
str_replace (&SmimeCryptAlg, "des");
break;
@@
-1902,7
+1903,16
@@
int smime_send_menu (HEADER * msg, int *redraw)
case 5:
str_replace (&SmimeCryptAlg, "rc2-128");
break;
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;
break;
}
break;
@@
-1921,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))) {
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;
str_replace (&SmimeDefaultKey, p);
msg->security |= SIGN;