update config

crypto/evp/c_allc.c

@@ -123,6 +123,7 @@ void openssl_add_all_ciphers_int(void)
     EVP_add_cipher_alias(SN_rc5_cbc, "RC5");
 #endif
 
+#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());
@@ -131,9 +132,9 @@ void openssl_add_all_ciphers_int(void)
     EVP_add_cipher(EVP_aes_128_ofb());
     EVP_add_cipher(EVP_aes_128_ctr());
     EVP_add_cipher(EVP_aes_128_gcm());
-#ifndef OPENSSL_NO_OCB
+# ifndef OPENSSL_NO_OCB
     EVP_add_cipher(EVP_aes_128_ocb());
-#endif
+# endif
     EVP_add_cipher(EVP_aes_128_xts());
     EVP_add_cipher(EVP_aes_128_ccm());
     EVP_add_cipher(EVP_aes_128_wrap());
@@ -149,9 +150,9 @@ void openssl_add_all_ciphers_int(void)
     EVP_add_cipher(EVP_aes_192_ofb());
     EVP_add_cipher(EVP_aes_192_ctr());
     EVP_add_cipher(EVP_aes_192_gcm());
-#ifndef OPENSSL_NO_OCB
+# ifndef OPENSSL_NO_OCB
     EVP_add_cipher(EVP_aes_192_ocb());
-#endif
+# endif
     EVP_add_cipher(EVP_aes_192_ccm());
     EVP_add_cipher(EVP_aes_192_wrap());
     EVP_add_cipher_alias(SN_id_aes192_wrap, "aes192-wrap");
@@ -166,9 +167,9 @@ void openssl_add_all_ciphers_int(void)
     EVP_add_cipher(EVP_aes_256_ofb());
     EVP_add_cipher(EVP_aes_256_ctr());
     EVP_add_cipher(EVP_aes_256_gcm());
-#ifndef OPENSSL_NO_OCB
+# ifndef OPENSSL_NO_OCB
     EVP_add_cipher(EVP_aes_256_ocb());
-#endif
+# endif
     EVP_add_cipher(EVP_aes_256_xts());
     EVP_add_cipher(EVP_aes_256_ccm());
     EVP_add_cipher(EVP_aes_256_wrap());
@@ -180,6 +181,7 @@ void openssl_add_all_ciphers_int(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_ecb());
@@ -216,6 +218,7 @@ void openssl_add_all_ciphers_int(void)
 # ifndef OPENSSL_NO_POLY1305
     EVP_add_cipher(EVP_chacha20_poly1305());
 # endif
+#endif
 
 #ifndef OPENSSL_NO_SMS4
     EVP_add_cipher(EVP_sms4_ecb());
@@ -236,6 +239,4 @@ void openssl_add_all_ciphers_int(void)
     EVP_add_cipher_alias(SN_sms4_cbc,"SMS4");
     EVP_add_cipher_alias(SN_sms4_cbc,"sms4");
 #endif
-
-#endif
 }

crypto/evp/c_alld.c

@@ -24,9 +24,11 @@ void openssl_add_all_digests_int(void)
     EVP_add_digest_alias(SN_md5, "ssl3-md5");
     EVP_add_digest(EVP_md5_sha1());
 #endif
+#ifndef OPENSSL_NO_SHA1
     EVP_add_digest(EVP_sha1());
     EVP_add_digest_alias(SN_sha1, "ssl3-sha1");
     EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA);
+#endif
 #if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES)
     EVP_add_digest(EVP_mdc2());
 #endif
@@ -35,10 +37,12 @@ void openssl_add_all_digests_int(void)
     EVP_add_digest_alias(SN_ripemd160, "ripemd");
     EVP_add_digest_alias(SN_ripemd160, "rmd160");
 #endif
+#ifndef OPENSSL_NO_SHA1
     EVP_add_digest(EVP_sha224());
     EVP_add_digest(EVP_sha256());
     EVP_add_digest(EVP_sha384());
     EVP_add_digest(EVP_sha512());
+#endif
 #ifndef OPENSSL_NO_WHIRLPOOL
     EVP_add_digest(EVP_whirlpool());
 #endif

crypto/evp/e_aes.c

@@ -8,6 +8,9 @@
  */
 
 #include <openssl/opensslconf.h>
+#ifdef OPENSSL_NO_AES
+NON_EMPTY_TRANSLATION_UNIT
+#else
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -2698,3 +2701,4 @@ BLOCK_CIPHER_custom(NID_aes, 192, 16, 12, ocb, OCB,
 BLOCK_CIPHER_custom(NID_aes, 256, 16, 12, ocb, OCB,
                     EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
 #endif                         /* OPENSSL_NO_OCB */
+#endif

crypto/evp/e_aes_cbc_hmac_sha1.c

@@ -8,6 +8,9 @@
  */
 
 #include <openssl/opensslconf.h>
+#ifdef OPENSSL_NO_AES
+NON_EMPTY_TRANSLATION_UNIT
+#else
 
 #include <stdio.h>
 #include <string.h>
@@ -955,3 +958,4 @@ const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void)
     return NULL;
 }
 #endif
+#endif

crypto/evp/e_aes_cbc_hmac_sha256.c

@@ -8,6 +8,9 @@
  */
 
 #include <openssl/opensslconf.h>
+#ifdef OPENSSL_NO_AES
+NON_EMPTY_TRANSLATION_UNIT
+#else
 
 #include <stdio.h>
 #include <string.h>
@@ -937,3 +940,4 @@ const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void)
     return NULL;
 }
 #endif
+#endif

crypto/evp/m_sha1.c

@@ -10,6 +10,8 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 
+#ifndef OPENSSL_NO_SHA1
+
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/sha.h>
@@ -231,3 +233,4 @@ const EVP_MD *EVP_sha512(void)
 {
     return (&sha512_md);
 }
+#endif