diff --git a/Configure b/Configure
index e26231e8..fddd3abc 100755
--- a/Configure
+++ b/Configure
@@ -406,8 +406,29 @@ my @disablables = (
     "weak-ssl-ciphers",
     "zlib",
     "zlib-dynamic",
-    "sm3", "sms4", "kdf2", "ecies", "ffx", "sm2", "paillier", "cpk", "otp", "gmapi", "ec2",
-    "bfibe", "bb1ibe", "sm9", "saf", "sdf", "skf", "sof", "zuc"
+    "sm3",
+    "sms4",
+    "kdf2",
+    "ecies",
+    "ffx",
+    "sm2",
+    "paillier",
+    "cpk",
+    "otp",
+    "gmapi",
+    "ec2",
+    "bfibe",
+    "bb1ibe",
+    "sm9",
+    "saf",
+    "sdf",
+    "skf",
+    "sof",
+    "zuc",
+    "aes",
+    "sha",
+    "md5",
+    "rsa",
     );
 foreach my $proto ((@tls, @dtls))
 	{
diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index ffef9c0c..2e8ff3c0 100644
--- a/crypto/evp/c_allc.c
+++ b/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
 }
diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
index a66dae25..5430fb39 100644
--- a/crypto/evp/c_alld.c
+++ b/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
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 619c6f85..482b26cb 100644
--- a/crypto/evp/e_aes.c
+++ b/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
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index 52c7c744..407b2b54 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/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
diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
index 5a92e0b8..6d814131 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/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
diff --git a/crypto/evp/m_sha1.c b/crypto/evp/m_sha1.c
index 8f30077a..df8e5aad 100644
--- a/crypto/evp/m_sha1.c
+++ b/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
diff --git a/engines/zeromem/cba_ecdh_engine.c b/engines/zeromem/cba_ecdh_engine.c
index 104a31f0..cd0ad63c 100755
--- a/engines/zeromem/cba_ecdh_engine.c
+++ b/engines/zeromem/cba_ecdh_engine.c
@@ -81,7 +81,6 @@ static int compute_key(void *out, size_t outlen,
 		{
 			if (KDF(&q.x, xlen, out, &outlen) == NULL)
 			{
-				ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_KDF_FAILED);
 				return -1;
 			}
 			ret = outlen;
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 8d75d53e..9ad4af3a 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -155,6 +155,9 @@ extern "C" {
 # define SSL_TXT_CAMELLIA        "CAMELLIA"
 # define SSL_TXT_CHACHA20        "CHACHA20"
 # define SSL_TXT_GOST            "GOST89"
+# define SSL_TXT_SMS4            "SMS4"
+# define SSL_TXT_SMS4_GCM        "SMS4GCM"
+# define SSL_TXT_SMS4_CCM        "SMS4CCM"
 
 # define SSL_TXT_MD5             "MD5"
 # define SSL_TXT_SHA1            "SHA1"
@@ -165,11 +168,13 @@ extern "C" {
 # define SSL_TXT_GOST89MAC12     "GOST89MAC12"
 # define SSL_TXT_SHA256          "SHA256"
 # define SSL_TXT_SHA384          "SHA384"
+# define SSL_TXT_SM3             "SM3"
 
 # define SSL_TXT_SSLV3           "SSLv3"
 # define SSL_TXT_TLSV1           "TLSv1"
 # define SSL_TXT_TLSV1_1         "TLSv1.1"
 # define SSL_TXT_TLSV1_2         "TLSv1.2"
+# define SSL_TXT_GMSV1_1         "GMSv1.1"
 
 # define SSL_TXT_ALL             "ALL"