diff options
| author | David Shaw <[email protected]> | 2004-01-17 03:06:50 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-01-17 03:06:50 +0000 |
| commit | 99f6f81769656e9992423ce55be8fe57d26a738e (patch) | |
| tree | 5f8f5ebe44f35a9938bb44d4391581e869b1e719 | |
| parent | * pubkey.c (setup_pubkey_table), elgamal.c (sign, verify, test_keys, (diff) | |
| download | gnupg-99f6f81769656e9992423ce55be8fe57d26a738e.tar.gz gnupg-99f6f81769656e9992423ce55be8fe57d26a738e.zip | |
* cipher.c (setup_cipher_table): May as well call Rijndael AES at this
point.
Diffstat (limited to '')
| -rw-r--r-- | cipher/ChangeLog | 5 | ||||
| -rw-r--r-- | cipher/cipher.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 90e5ea10d..26660413e 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,5 +1,8 @@ 2004-01-16 David Shaw <[email protected]> + * cipher.c (setup_cipher_table): May as well call Rijndael AES at + this point. + * pubkey.c (setup_pubkey_table), elgamal.c (sign, verify, test_keys, elg_sign, elg_verify, elg_get_info): Remove the last bits of Elgamal type 20 support. @@ -23,7 +26,7 @@ * blowfish.c, twofish.c [__riscos__]: Removal of unnecessary #ifdef __riscos__ sections. -2003-12-17 David Shaw <[email protected]> +2003-12-17 David Shaw <[email protected]> * dsa.h, dsa.c (dsa_verify), elgamal.h, elgamal.c (elg_verify), rsa.h, rsa.c (rsa_verify), pubkey.c (dummy_verify, pubkey_verify): diff --git a/cipher/cipher.c b/cipher/cipher.c index 4518d909c..34d008fa3 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -88,7 +88,7 @@ setup_cipher_table(void) int i=0; #ifdef USE_AES - cipher_table[i].algo = CIPHER_ALGO_RIJNDAEL; + cipher_table[i].algo = CIPHER_ALGO_AES; cipher_table[i].name = rijndael_get_info( cipher_table[i].algo, &cipher_table[i].keylen, &cipher_table[i].blocksize, @@ -99,7 +99,7 @@ setup_cipher_table(void) if( !cipher_table[i].name ) BUG(); i++; - cipher_table[i].algo = CIPHER_ALGO_RIJNDAEL192; + cipher_table[i].algo = CIPHER_ALGO_AES192; cipher_table[i].name = rijndael_get_info( cipher_table[i].algo, &cipher_table[i].keylen, &cipher_table[i].blocksize, @@ -110,7 +110,7 @@ setup_cipher_table(void) if( !cipher_table[i].name ) BUG(); i++; - cipher_table[i].algo = CIPHER_ALGO_RIJNDAEL256; + cipher_table[i].algo = CIPHER_ALGO_AES256; cipher_table[i].name = rijndael_get_info( cipher_table[i].algo, &cipher_table[i].keylen, &cipher_table[i].blocksize, |