Fix AES code.

[openssl.git] / crypto / evp / c_allc.c

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index 02b3579b86b30257d00f1a07ae477058e1c0303f..41f1ff135e1bb6dcf97b615917d118779175428e 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -64,7 +64,6 @@
 
 void OpenSSL_add_all_ciphers(void)
        {
-       int i,j;
 
 #ifndef NO_DES
        EVP_add_cipher(EVP_des_cfb());
@@ -147,13 +146,13 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_rc5_cbc,"RC5");
 #endif
 
-#ifndef NO_RIJNDAEL
-       for(i=0 ; i < 3 ; ++i)
-           for(j=0 ; j < 3 ; ++j)
-               {
-               EVP_add_cipher(EVP_rijndael_ecb(i,j));
-               EVP_add_cipher(EVP_rijndael_cbc(i,j));
-               }
+#ifndef NO_AES
+       EVP_add_cipher(EVP_aes_128_ecb());
+       EVP_add_cipher(EVP_aes_128_cbc());
+       EVP_add_cipher(EVP_aes_192_ecb());
+       EVP_add_cipher(EVP_aes_192_cbc());
+       EVP_add_cipher(EVP_aes_256_ecb());
+       EVP_add_cipher(EVP_aes_256_cbc());
 #endif
        PKCS12_PBE_add();
        PKCS5_PBE_add();