1 files changed, 6 insertions, 12 deletions

diff --git a/src/lib/libcrypto/evp/c_allc.c b/src/lib/libcrypto/evp/c_allc.c
index 2a45d435e5..c5f9268378 100644
--- a/src/lib/libcrypto/evp/c_allc.c
+++ b/src/lib/libcrypto/evp/c_allc.c
@@ -98,9 +98,6 @@ void OpenSSL_add_all_ciphers(void)
 #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
@@ -169,9 +166,9 @@ 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());
-        EVP_add_cipher(EVP_aes_128_gcm());
-        EVP_add_cipher(EVP_aes_128_xts());
+#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());
@@ -180,8 +177,9 @@ 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());
-        EVP_add_cipher(EVP_aes_192_gcm());
+#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());
@@ -190,15 +188,11 @@ 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());
-        EVP_add_cipher(EVP_aes_256_gcm());
-        EVP_add_cipher(EVP_aes_256_xts());
+#endif
         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
 #endif
 
 #ifndef OPENSSL_NO_CAMELLIA