--- confirm-crypt-hook/PATCHES Dec 2002 17:44:54 -0000 3.6 +++ confirm-crypt-hook/PATCHES Mar 2003 11:05:37 -0000 @@ -0,0 +1 @@ +patch-1.5.4.dw.confirm-crypt-hook.1 --- confirm-crypt-hook/init.h Mar 2003 09:17:32 -0000 3.36 +++ confirm-crypt-hook/init.h Mar 2003 11:05:38 -0000 @@ -1219,2 +1219,11 @@ struct option_t MuttVars[] = { */ + { "pgp_confirmhook", DT_SYN, R_NONE, UL "crypt_confirmhook", 1 }, + { "crypt_confirmhook", DT_BOOL, R_NONE, OPTCRYPTCONFIRMHOOK, 1 }, + /* + ** .pp + ** If set, then you will be prompted for confirmation of keys when using + ** the \fIcrypt-hook\fP command. If unset, no such confirmation prompt will + ** be presented. This is generally considered unsafe, especially where + ** typos are concerned. + */ { "pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, 1}, --- confirm-crypt-hook/mutt.h Mar 2003 08:26:20 -0000 3.15 +++ confirm-crypt-hook/mutt.h Mar 2003 11:05:38 -0000 @@ -436,2 +436,3 @@ enum OPTSDEFAULTDECRYPTKEY, + OPTCRYPTCONFIRMHOOK, OPTPGPIGNORESUB, --- confirm-crypt-hook/pgp.c Feb 2003 09:50:00 -0000 3.23 +++ confirm-crypt-hook/pgp.c Mar 2003 11:05:38 -0000 @@ -1055,3 +1055,3 @@ char *pgp_findKeys (ADDRESS *to, ADDRESS snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox); - if ((r = mutt_yesorno (buf, M_YES)) == M_YES) + if (!option(OPTCRYPTCONFIRMHOOK) || (r = mutt_yesorno (buf, M_YES)) == M_YES) {