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/keygen.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 '')
| -rw-r--r-- | g10/keygen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index 6b8cf0ecd..970d4766c 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1523,12 +1523,12 @@ do_create( int algo, unsigned int nbits, KBNODE pub_root, KBNODE sec_root, "disks) during the prime generation; this gives the random number\n" "generator a better chance to gain enough entropy.\n") ); - if( algo == PUBKEY_ALGO_ELGAMAL || algo == PUBKEY_ALGO_ELGAMAL_E ) - rc = gen_elg(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate); + if( algo == PUBKEY_ALGO_ELGAMAL_E ) + rc = gen_elg(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate); else if( algo == PUBKEY_ALGO_DSA ) - rc = gen_dsa(nbits, pub_root, sec_root, dek, s2k, sk, expiredate); + rc = gen_dsa(nbits, pub_root, sec_root, dek, s2k, sk, expiredate); else if( algo == PUBKEY_ALGO_RSA ) - rc = gen_rsa(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate); + rc = gen_rsa(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate); else BUG(); |