diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2003-11-28 00:05:27 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2003-11-28 00:05:27 +0000 |
| commit | 660205cc0e3dab7b8c6dee8d7433393584338418 (patch) | |
| tree | cbe0255df574fa3f543db28e63be88934e4afc8d /security/gnupg1/files/patch-keygen.c | |
| parent | Update to vpopmail-5.3.30, fixing a critical update_rules bug. (diff) | |
*** Security Update (not fix, only workaround) ***
Disable the ability to create signatures using the ElGamal
sign+encrypt (type 20) keys as well as to remove the option
to create such keys.
Reported by: se
References: http://lists.gnupg.org/pipermail/gnupg-devel/2003-November/020570.html
http://lists.gnupg.org/pipermail/gnupg-devel/2003-November/020569.html
Approved by portmgr (will)
Notes
Notes:
svn path=/head/; revision=94812
Diffstat (limited to '')
| -rw-r--r-- | security/gnupg1/files/patch-keygen.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/security/gnupg1/files/patch-keygen.c b/security/gnupg1/files/patch-keygen.c new file mode 100644 index 000000000000..b4051ed22b02 --- /dev/null +++ b/security/gnupg1/files/patch-keygen.c @@ -0,0 +1,33 @@ +--- g10/keygen.c.orig Tue Jul 29 03:34:41 2003 ++++ g10/keygen.c Thu Nov 27 18:54:55 2003 +@@ -958,8 +958,6 @@ + tty_printf( _(" (%d) DSA (sign only)\n"), 2 ); + if( addmode ) + tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 ); +- if (opt.expert) +- tty_printf( _(" (%d) ElGamal (sign and encrypt)\n"), 4 ); + tty_printf( _(" (%d) RSA (sign only)\n"), 5 ); + if (addmode) + tty_printf( _(" (%d) RSA (encrypt only)\n"), 6 ); +@@ -989,21 +987,6 @@ + algo = PUBKEY_ALGO_RSA; + *r_usage = PUBKEY_USAGE_SIG; + break; +- } +- else if( algo == 4 && opt.expert) +- { +- tty_printf(_( +-"The use of this algorithm is only supported by GnuPG. You will not be\n" +-"able to use this key to communicate with PGP users. This algorithm is also\n" +-"very slow, and may not be as secure as the other choices.\n")); +- +- if( cpr_get_answer_is_yes("keygen.algo.elg_se", +- _("Create anyway? "))) +- { +- algo = PUBKEY_ALGO_ELGAMAL; +- *r_usage = PUBKEY_USAGE_ENC | PUBKEY_USAGE_SIG; +- break; +- } + } + else if( algo == 3 && addmode ) { + algo = PUBKEY_ALGO_ELGAMAL_E; |