1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

* misc.c (print_cipher_algo_note): May as well call Rijndael AES

at this point.

* keygen.c (do_create), misc.c (openpgp_pk_algo_usage): Remove the
last bits of Elgamal type 20 support.
This commit is contained in:
David Shaw 2004-01-17 03:14:14 +00:00
parent 57c585bc0f
commit 1d12c12142
3 changed files with 18 additions and 12 deletions

View file

@ -162,9 +162,9 @@ print_cipher_algo_note( int algo )
|| algo == CIPHER_ALGO_CAST5
|| algo == CIPHER_ALGO_BLOWFISH
|| algo == CIPHER_ALGO_TWOFISH
|| algo == CIPHER_ALGO_RIJNDAEL
|| algo == CIPHER_ALGO_RIJNDAEL192
|| algo == CIPHER_ALGO_RIJNDAEL256
|| algo == CIPHER_ALGO_AES
|| algo == CIPHER_ALGO_AES192
|| algo == CIPHER_ALGO_AES256
)
;
else {
@ -255,9 +255,6 @@ openpgp_pk_algo_usage ( int algo )
case PUBKEY_ALGO_DSA:
use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_AUTH;
break;
case PUBKEY_ALGO_ELGAMAL:
use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC | PUBKEY_USAGE_AUTH;
break;
default:
break;
}