Add AES-SHA256 stitch.

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

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index bb78c68160ad9246efa3bab42e9340ef113b2260..1e3a89e5a41b65a0db4ec1546037f0f609846cbf 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -64,12 +64,15 @@
 
 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_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());
@@ -92,12 +95,15 @@ 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());
+#ifndef OPENSSL_NO_MD5
+       EVP_add_cipher(EVP_rc4_hmac_md5());
+#endif
 #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 +112,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());
@@ -117,7 +132,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 +142,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 +153,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,11 +162,76 @@ 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_128_cfb());
+       EVP_add_cipher(EVP_aes_128_cfb1());
+       EVP_add_cipher(EVP_aes_128_cfb8());
+       EVP_add_cipher(EVP_aes_128_ofb());
+       EVP_add_cipher(EVP_aes_128_ctr());
+       EVP_add_cipher(EVP_aes_128_gcm());
+       EVP_add_cipher(EVP_aes_128_xts());
+       EVP_add_cipher(EVP_aes_128_ccm());
+       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());
+       EVP_add_cipher(EVP_aes_192_ctr());
+       EVP_add_cipher(EVP_aes_192_gcm());
+       EVP_add_cipher(EVP_aes_192_ccm());
+       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());
+       EVP_add_cipher(EVP_aes_256_ctr());
+       EVP_add_cipher(EVP_aes_256_gcm());
+       EVP_add_cipher(EVP_aes_256_xts());
+       EVP_add_cipher(EVP_aes_256_ccm());
+       EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
+       EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
+       EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
+       EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
+#endif
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA256)
+       EVP_add_cipher(EVP_aes_128_cbc_hmac_sha256());
+       EVP_add_cipher(EVP_aes_256_cbc_hmac_sha256());
+#endif
+#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();
        }