diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 13 | ||||
| -rw-r--r-- | g10/keygen.c | 8 | ||||
| -rw-r--r-- | g10/misc.c | 9 |
3 files changed, 18 insertions, 12 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c281c590b..8b42d8ab0 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2004-01-16 David Shaw <[email protected]> + + * 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. + 2004-01-03 Stefan Bellon <[email protected]> * compress.c [__riscos__]: Only use RISC OS' own ZLib module if @@ -68,7 +76,7 @@ * main.h, import.c (import_options), export.c (export_options): Pass the noisy flag through. -2003-12-17 David Shaw <[email protected]> +2003-12-17 David Shaw <[email protected]> * build-packet.c (write_fake_data, do_secret_key), seckey-cert.c (do_check): Use an unsigned length for mpi_get_opaque. @@ -9148,7 +9156,8 @@ Thu Feb 12 22:24:42 1998 Werner Koch (wk@frodo) * pubkey-enc.c (get_session_key): rewritten - Copyright 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2002, 2003, + 2004 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without 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(); 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; } |