security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-08 17:43:04 +01:00
Code Activity

* keygen.c (ask_algo): Remove ability to generate Elgamal sign+encrypt

Browse Source 
keys.

* getkey.c (merge_selfsigs_main, merge_selfsigs_subkey): Disallow use of
sign+encrypt Elgamal keys.
This commit is contained in:
David Shaw 2003-11-27 13:53:34 +00:00
parent d3e5200206
commit 973c868961
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2003-11-27 David Shaw <dshaw@jabberwocky.com>
* keygen.c (ask_algo): Remove ability to generate Elgamal
sign+encrypt keys.
* getkey.c (merge_selfsigs_main, merge_selfsigs_subkey): Disallow
use of sign+encrypt Elgamal keys.
2003-11-20 David Shaw <dshaw@jabberwocky.com> 2003-11-20 David Shaw <dshaw@jabberwocky.com>
* seskey.c (do_encode_md): Comment about earlier (pre-PGP 2.3) * seskey.c (do_encode_md): Comment about earlier (pre-PGP 2.3)

12
g10/getkey.c
View File

@ -1677,6 +1677,11 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
if ( x ) /* mask it down to the actual allowed usage */ if ( x ) /* mask it down to the actual allowed usage */
key_usage &= x; key_usage &= x;
} }
/* Type 20 Elgamal keys are not usable. */
if(pk->pubkey_algo==PUBKEY_ALGO_ELGAMAL)
key_usage=0;
pk->pubkey_usage = key_usage; pk->pubkey_usage = key_usage;
if ( !key_expire_seen ) { if ( !key_expire_seen ) {
@ -1893,6 +1898,13 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
if ( x ) /* mask it down to the actual allowed usage */ if ( x ) /* mask it down to the actual allowed usage */
key_usage &= x; key_usage &= x;
} }
/* Type 20 Elgamal subkeys or any subkey on a type 20 primary are
not usable. */
if(mainpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL
|| subpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL)
key_usage=0;
subpk->pubkey_usage = key_usage; subpk->pubkey_usage = key_usage;
p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_KEY_EXPIRE, NULL); p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_KEY_EXPIRE, NULL);

29
g10/keygen.c
View File

@ -1052,13 +1052,11 @@ ask_algo (int addmode, unsigned int *r_usage)
tty_printf( _(" (%d) DSA (sign only)\n"), 2 ); tty_printf( _(" (%d) DSA (sign only)\n"), 2 );
if( addmode ) if( addmode )
tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 ); tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 );
if (opt.expert) tty_printf( _(" (%d) RSA (sign only)\n"), 4 );
tty_printf( _(" (%d) ElGamal (sign and encrypt)\n"), 4 );
tty_printf( _(" (%d) RSA (sign only)\n"), 5 );
if (addmode) if (addmode)
tty_printf( _(" (%d) RSA (encrypt only)\n"), 6 ); tty_printf( _(" (%d) RSA (encrypt only)\n"), 5 );
if (opt.expert) if (opt.expert)
tty_printf( _(" (%d) RSA (sign and encrypt)\n"), 7 ); tty_printf( _(" (%d) RSA (sign and encrypt)\n"), 6 );
for(;;) { for(;;) {
answer = cpr_get("keygen.algo",_("Your selection? ")); answer = cpr_get("keygen.algo",_("Your selection? "));
@ -1069,36 +1067,21 @@ ask_algo (int addmode, unsigned int *r_usage)
algo = 0; /* create both keys */ algo = 0; /* create both keys */
break; break;
} }
else if( algo == 7 && opt.expert ) { else if( algo == 6 && opt.expert ) {
algo = PUBKEY_ALGO_RSA; algo = PUBKEY_ALGO_RSA;
*r_usage = PUBKEY_USAGE_ENC | PUBKEY_USAGE_SIG; *r_usage = PUBKEY_USAGE_ENC | PUBKEY_USAGE_SIG;
break; break;
} }
else if( algo == 6 && addmode ) { else if( algo == 5 && addmode ) {
algo = PUBKEY_ALGO_RSA; algo = PUBKEY_ALGO_RSA;
*r_usage = PUBKEY_USAGE_ENC; *r_usage = PUBKEY_USAGE_ENC;
break; break;
} }
else if( algo == 5 ) { else if( algo == 4 ) {
algo = PUBKEY_ALGO_RSA; algo = PUBKEY_ALGO_RSA;
*r_usage = PUBKEY_USAGE_SIG; *r_usage = PUBKEY_USAGE_SIG;
break; 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 ) { else if( algo == 3 && addmode ) {
algo = PUBKEY_ALGO_ELGAMAL_E; algo = PUBKEY_ALGO_ELGAMAL_E;
*r_usage = PUBKEY_USAGE_ENC; *r_usage = PUBKEY_USAGE_ENC;