diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2001-02-07 18:15:18 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2001-02-07 18:15:18 +0000 |
commit | deb2c1a1c58fb738b3216b663212572170de8183 (patch) | |
tree | f6aa0527d08b8fdcf4ce63eaf85aa3d6a73b1c34 /ssl/ssl_algs.c | |
parent | d4219c485b34818df8aa530f7d8d1c1daff44306 (diff) | |
download | openssl-new-deb2c1a1c58fb738b3216b663212572170de8183.tar.gz |
Fix AES code.
Update Rijndael source to v3.0
Add AES OIDs.
Change most references of Rijndael to AES.
Add new draft AES ciphersuites.
Diffstat (limited to 'ssl/ssl_algs.c')
-rw-r--r-- | ssl/ssl_algs.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c index 52d127ed67..549c3e8d5e 100644 --- a/ssl/ssl_algs.c +++ b/ssl/ssl_algs.c @@ -63,7 +63,6 @@ int SSL_library_init(void) { - int k; #ifndef NO_DES EVP_add_cipher(EVP_des_cbc()); @@ -78,9 +77,11 @@ int SSL_library_init(void) #ifndef NO_RC2 EVP_add_cipher(EVP_rc2_cbc()); #endif - for(k=0 ; k < 2 ; ++k) - EVP_add_cipher(EVP_rijndael_cbc(0,k)); - +#ifndef NO_AES + EVP_add_cipher(EVP_aes_128_cbc()); + EVP_add_cipher(EVP_aes_192_cbc()); + EVP_add_cipher(EVP_aes_256_cbc()); +#endif #ifndef NO_MD2 EVP_add_digest(EVP_md2()); #endif |