Really add the EVP and all of the DES changes.

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

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index bb78c68160ad9246efa3bab42e9340ef113b2260..def53b67858ef1ca0e681acade4801001a2e2379 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -64,9 +64,8 @@
 
 void OpenSSL_add_all_ciphers(void)
        {
-       int i,j;
 
-#ifndef NO_DES
+#ifndef OPENSSL_NO_DES
        EVP_add_cipher(EVP_des_cfb());
        EVP_add_cipher(EVP_des_ede_cfb());
        EVP_add_cipher(EVP_des_ede3_cfb());
@@ -83,7 +82,11 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_des_cbc,"DES");
        EVP_add_cipher_alias(SN_des_cbc,"des");
        EVP_add_cipher(EVP_des_ede_cbc());
+# ifdef OPENSSL_OPENBSD_DEV_CRYPTO
+       EVP_add_cipher(EVP_dev_crypto_des_ede3_cbc());
+# else
        EVP_add_cipher(EVP_des_ede3_cbc());
+# endif
        EVP_add_cipher_alias(SN_des_ede3_cbc,"DES3");
        EVP_add_cipher_alias(SN_des_ede3_cbc,"des3");
 
@@ -92,12 +95,12 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher(EVP_des_ede3());
 #endif
 
-#ifndef NO_RC4
+#ifndef OPENSSL_NO_RC4
        EVP_add_cipher(EVP_rc4());
        EVP_add_cipher(EVP_rc4_40());
 #endif
 
-#ifndef NO_IDEA
+#ifndef OPENSSL_NO_IDEA
        EVP_add_cipher(EVP_idea_ecb());
        EVP_add_cipher(EVP_idea_cfb());
        EVP_add_cipher(EVP_idea_ofb());
@@ -106,7 +109,7 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_idea_cbc,"idea");
 #endif
 
-#ifndef NO_RC2
+#ifndef OPENSSL_NO_RC2
        EVP_add_cipher(EVP_rc2_ecb());
        EVP_add_cipher(EVP_rc2_cfb());
        EVP_add_cipher(EVP_rc2_ofb());
@@ -117,7 +120,7 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_rc2_cbc,"rc2");
 #endif
 
-#ifndef NO_BF
+#ifndef OPENSSL_NO_BF
        EVP_add_cipher(EVP_bf_ecb());
        EVP_add_cipher(EVP_bf_cfb());
        EVP_add_cipher(EVP_bf_ofb());
@@ -127,7 +130,7 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_bf_cbc,"blowfish");
 #endif
 
-#ifndef NO_CAST
+#ifndef OPENSSL_NO_CAST
        EVP_add_cipher(EVP_cast5_ecb());
        EVP_add_cipher(EVP_cast5_cfb());
        EVP_add_cipher(EVP_cast5_ofb());
@@ -138,7 +141,7 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_cast5_cbc,"cast-cbc");
 #endif
 
-#ifndef NO_RC5
+#ifndef OPENSSL_NO_RC5
        EVP_add_cipher(EVP_rc5_32_12_16_ecb());
        EVP_add_cipher(EVP_rc5_32_12_16_cfb());
        EVP_add_cipher(EVP_rc5_32_12_16_ofb());
@@ -147,10 +150,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));
+#ifndef OPENSSL_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();