Update NO_* macros.

6 files changed, 13 insertions, 15 deletions

diff --git a/crypto/crypto.c b/crypto/crypto.c
index 2011dc368c..2387933b5e 100644
--- a/crypto/crypto.c
+++ b/crypto/crypto.c
@@ -361,7 +361,7 @@
 #include "evp/e_ecb_r2.c"
 #include "evp/e_ofb_r2.c"
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
 #include "evp/e_cbc_bf.c"
 #include "evp/e_cfb_bf.c"
 #include "evp/e_ecb_bf.c"
@@ -403,7 +403,7 @@
 #endif
 
 #ifdef CRYPTO_BLOWFISH_SUBSET
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
 #include "bf/bf_cfb64.c"
 #include "bf/bf_ecb.c"
 #ifndef BF_ASM
@@ -505,6 +505,7 @@
 #endif
 #endif
 
+#ifndef NO_SHA
 #ifdef CRYPTO_SHA1_SUBSET
 #ifndef NO_SHA1
 #include "sha/sha1_one.c"
@@ -515,14 +516,15 @@
 #endif
 
 #ifdef CRYPTO_SHA_SUBSET
-#ifndef NO_SHA
+#ifndef NO_SHA0
 #include "evp/m_dss.c"
 #include "sha/sha_dgst.c"
 #include "sha/sha_one.c"
 #include "evp/m_sha.c"
 #endif
 #endif
-
+#endif
+ 
 #ifdef CRYPTO_STACK_SUBSET
 #include "stack/stack.c"
 #endif
diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index b48563e3c0..278e9e4dcf 100644
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -121,7 +121,7 @@ void SSLeay_add_all_ciphers(void)
 	EVP_add_cipher_alias(SN_rc2_cbc,"rc2");
 #endif
 
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
 	EVP_add_cipher(EVP_bf_ecb());
 	EVP_add_cipher(EVP_bf_cfb());
 	EVP_add_cipher(EVP_bf_ofb());
@@ -169,7 +169,7 @@ void SSLeay_add_all_digests(void)
 	EVP_add_digest(EVP_dss());
 #endif
 #endif
-#ifndef NO_SHA1
+#ifndef NO_SHA
 	EVP_add_digest(EVP_sha1());
 	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
 	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
@@ -183,7 +183,7 @@ void SSLeay_add_all_digests(void)
 #if !defined(NO_MDC2) && !defined(NO_DES)
 	EVP_add_digest(EVP_mdc2());
 #endif
-#ifndef NO_RMD160
+#ifndef NO_RIPEMD
 	EVP_add_digest(EVP_ripemd160());
 	EVP_add_digest_alias(SN_ripemd160,"ripemd");
 	EVP_add_digest_alias(SN_ripemd160,"rmd160");
diff --git a/crypto/evp/e_cbc_bf.c b/crypto/evp/e_cbc_bf.c
index a523d011c2..a55b842667 100644
--- a/crypto/evp/e_cbc_bf.c
+++ b/crypto/evp/e_cbc_bf.c
@@ -56,8 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_BLOWFISH
-
+#ifndef NO_BF
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
diff --git a/crypto/evp/e_cfb_bf.c b/crypto/evp/e_cfb_bf.c
index 0fb4d7fc32..63e1e624ea 100644
--- a/crypto/evp/e_cfb_bf.c
+++ b/crypto/evp/e_cfb_bf.c
@@ -56,8 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_BLOWFISH
-
+#ifndef NO_BF
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
diff --git a/crypto/evp/e_ecb_bf.c b/crypto/evp/e_ecb_bf.c
index d6924ac870..334736d253 100644
--- a/crypto/evp/e_ecb_bf.c
+++ b/crypto/evp/e_ecb_bf.c
@@ -56,8 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_BLOWFISH
-
+#ifndef NO_BF
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
diff --git a/crypto/evp/e_ofb_bf.c b/crypto/evp/e_ofb_bf.c
index 52a6f5729c..c82154b549 100644
--- a/crypto/evp/e_ofb_bf.c
+++ b/crypto/evp/e_ofb_bf.c
@@ -56,8 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_BLOWFISH
-
+#ifndef NO_BF
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>