RFC 5649 support.

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

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index fc16432a05e40eadb5b2bbe5e27e13bb07370d7c..a714f1246bc15e7efc2d497ff8fb564dd2aee8c8 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -71,6 +71,8 @@ void OpenSSL_add_all_ciphers(void)
        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,11 +93,15 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher(EVP_des_ecb());
        EVP_add_cipher(EVP_des_ede());
        EVP_add_cipher(EVP_des_ede3());
+       EVP_add_cipher(EVP_des_ede3_wrap());
 #endif
 
 #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 OPENSSL_NO_IDEA
@@ -107,6 +113,15 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_idea_cbc,"idea");
 #endif
 
+#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());
@@ -155,9 +170,12 @@ void OpenSSL_add_all_ciphers(void)
        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(EVP_aes_128_gcm());
+       EVP_add_cipher(EVP_aes_128_xts());
+       EVP_add_cipher(EVP_aes_128_ccm());
+       EVP_add_cipher(EVP_aes_128_wrap());
+       EVP_add_cipher(EVP_aes_128_wrap_pad());
        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());
@@ -166,9 +184,11 @@ void OpenSSL_add_all_ciphers(void)
        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(EVP_aes_192_gcm());
+       EVP_add_cipher(EVP_aes_192_ccm());
+       EVP_add_cipher(EVP_aes_192_wrap());
+       EVP_add_cipher(EVP_aes_192_wrap_pad());
        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());
@@ -177,10 +197,48 @@ void OpenSSL_add_all_ciphers(void)
        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(EVP_aes_256_gcm());
+       EVP_add_cipher(EVP_aes_256_xts());
+       EVP_add_cipher(EVP_aes_256_ccm());
+       EVP_add_cipher(EVP_aes_256_wrap());
+       EVP_add_cipher(EVP_aes_256_wrap_pad());
        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
        }