Traditional Yuletide commit ;-)

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

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index 41f1ff135e1bb6dcf97b615917d118779175428e..c5f9268378b0756ae8651220a3ece597a446b7c4 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -65,10 +65,14 @@
 void OpenSSL_add_all_ciphers(void)
        {
 
-#ifndef NO_DES
+#ifndef OPENSSL_NO_DES
        EVP_add_cipher(EVP_des_cfb());
+       EVP_add_cipher(EVP_des_cfb1());
+       EVP_add_cipher(EVP_des_cfb8());
        EVP_add_cipher(EVP_des_ede_cfb());
        EVP_add_cipher(EVP_des_ede3_cfb());
+       EVP_add_cipher(EVP_des_ede3_cfb1());
+       EVP_add_cipher(EVP_des_ede3_cfb8());
 
        EVP_add_cipher(EVP_des_ofb());
        EVP_add_cipher(EVP_des_ede_ofb());
@@ -91,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());
@@ -105,7 +109,16 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_idea_cbc,"idea");
 #endif
 
-#ifndef NO_RC2
+#ifndef OPENSSL_NO_SEED
+       EVP_add_cipher(EVP_seed_ecb());
+       EVP_add_cipher(EVP_seed_cfb());
+       EVP_add_cipher(EVP_seed_ofb());
+       EVP_add_cipher(EVP_seed_cbc());
+       EVP_add_cipher_alias(SN_seed_cbc,"SEED");
+       EVP_add_cipher_alias(SN_seed_cbc,"seed");
+#endif
+
+#ifndef OPENSSL_NO_RC2
        EVP_add_cipher(EVP_rc2_ecb());
        EVP_add_cipher(EVP_rc2_cfb());
        EVP_add_cipher(EVP_rc2_ofb());
@@ -116,7 +129,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());
@@ -126,7 +139,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());
@@ -137,7 +150,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());
@@ -146,14 +159,66 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_rc5_cbc,"RC5");
 #endif
 
-#ifndef NO_AES
+#ifndef OPENSSL_NO_AES
        EVP_add_cipher(EVP_aes_128_ecb());
        EVP_add_cipher(EVP_aes_128_cbc());
+       EVP_add_cipher(EVP_aes_128_cfb());
+       EVP_add_cipher(EVP_aes_128_cfb1());
+       EVP_add_cipher(EVP_aes_128_cfb8());
+       EVP_add_cipher(EVP_aes_128_ofb());
+#if 0
+       EVP_add_cipher(EVP_aes_128_ctr());
+#endif
+       EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
+       EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
        EVP_add_cipher(EVP_aes_192_ecb());
        EVP_add_cipher(EVP_aes_192_cbc());
+       EVP_add_cipher(EVP_aes_192_cfb());
+       EVP_add_cipher(EVP_aes_192_cfb1());
+       EVP_add_cipher(EVP_aes_192_cfb8());
+       EVP_add_cipher(EVP_aes_192_ofb());
+#if 0
+       EVP_add_cipher(EVP_aes_192_ctr());
+#endif
+       EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
+       EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
        EVP_add_cipher(EVP_aes_256_ecb());
        EVP_add_cipher(EVP_aes_256_cbc());
+       EVP_add_cipher(EVP_aes_256_cfb());
+       EVP_add_cipher(EVP_aes_256_cfb1());
+       EVP_add_cipher(EVP_aes_256_cfb8());
+       EVP_add_cipher(EVP_aes_256_ofb());
+#if 0
+       EVP_add_cipher(EVP_aes_256_ctr());
+#endif
+       EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
+       EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
+#endif
+
+#ifndef OPENSSL_NO_CAMELLIA
+       EVP_add_cipher(EVP_camellia_128_ecb());
+       EVP_add_cipher(EVP_camellia_128_cbc());
+       EVP_add_cipher(EVP_camellia_128_cfb());
+       EVP_add_cipher(EVP_camellia_128_cfb1());
+       EVP_add_cipher(EVP_camellia_128_cfb8());
+       EVP_add_cipher(EVP_camellia_128_ofb());
+       EVP_add_cipher_alias(SN_camellia_128_cbc,"CAMELLIA128");
+       EVP_add_cipher_alias(SN_camellia_128_cbc,"camellia128");
+       EVP_add_cipher(EVP_camellia_192_ecb());
+       EVP_add_cipher(EVP_camellia_192_cbc());
+       EVP_add_cipher(EVP_camellia_192_cfb());
+       EVP_add_cipher(EVP_camellia_192_cfb1());
+       EVP_add_cipher(EVP_camellia_192_cfb8());
+       EVP_add_cipher(EVP_camellia_192_ofb());
+       EVP_add_cipher_alias(SN_camellia_192_cbc,"CAMELLIA192");
+       EVP_add_cipher_alias(SN_camellia_192_cbc,"camellia192");
+       EVP_add_cipher(EVP_camellia_256_ecb());
+       EVP_add_cipher(EVP_camellia_256_cbc());
+       EVP_add_cipher(EVP_camellia_256_cfb());
+       EVP_add_cipher(EVP_camellia_256_cfb1());
+       EVP_add_cipher(EVP_camellia_256_cfb8());
+       EVP_add_cipher(EVP_camellia_256_ofb());
+       EVP_add_cipher_alias(SN_camellia_256_cbc,"CAMELLIA256");
+       EVP_add_cipher_alias(SN_camellia_256_cbc,"camellia256");
 #endif
-       PKCS12_PBE_add();
-       PKCS5_PBE_add();
        }