diff options
| author | David Shaw <[email protected]> | 2004-01-17 03:14:14 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-01-17 03:14:14 +0000 |
| commit | 1d12c12142290494434bf334748b94ea8ca446e6 (patch) | |
| tree | 5428d56a96bc183df99564255fb5609d7bac77a3 /g10/misc.c | |
| parent | * cipher.h: Remove the old CIPHER_ALGO_RINJDAEL values. is_ELGAMAL() now (diff) | |
| download | gnupg-1d12c12142290494434bf334748b94ea8ca446e6.tar.gz gnupg-1d12c12142290494434bf334748b94ea8ca446e6.zip | |
* 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.
Diffstat (limited to 'g10/misc.c')
| -rw-r--r-- | g10/misc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/g10/misc.c b/g10/misc.c index 1941b2c61..e3713a062 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -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; } |