aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/ssl_init.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-04-13 11:28:45 +0100
committerMatt Caswell <matt@openssl.org>2016-04-13 21:25:24 +0100
commit5158c763f5af973b26dd1927956ac27b6171de5c (patch)
tree4ca9540aa6a821c4d367a76341ac6a551aeeeaa8 /ssl/ssl_init.c
parent7ec8de16fe23e207d3e1bbb95d53843dbc9c06c8 (diff)
downloadopenssl-5158c763f5af973b26dd1927956ac27b6171de5c.tar.gz
Remove OPENSSL_NO_AES guards
no-aes is no longer a Configure option and therefore the OPENSSL_NO_AES guards can be removed. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/ssl_init.c')
-rw-r--r--ssl/ssl_init.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index 54892b9ac8..593ba1d2b6 100644
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c
@@ -97,7 +97,6 @@ static void ossl_init_ssl_base(void)
*/
EVP_add_cipher(EVP_rc2_40_cbc());
#endif
-#ifndef OPENSSL_NO_AES
EVP_add_cipher(EVP_aes_128_cbc());
EVP_add_cipher(EVP_aes_192_cbc());
EVP_add_cipher(EVP_aes_256_cbc());
@@ -109,7 +108,6 @@ static void ossl_init_ssl_base(void)
EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
EVP_add_cipher(EVP_aes_128_cbc_hmac_sha256());
EVP_add_cipher(EVP_aes_256_cbc_hmac_sha256());
-#endif
#ifndef OPENSSL_NO_CAMELLIA
EVP_add_cipher(EVP_camellia_128_cbc());
EVP_add_cipher(EVP_camellia_256_cbc());