From: Richard Levitte <levitte@openssl.org>
Date: Wed, 4 Dec 2002 22:54:02 +0000 (+0000)
Subject: Do not implement RC4 stuff if RC4 is disabled.  Concequently, apply the same
X-Git-Tag: STATE_before_zlib~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=439ae4d398bd7723b68d18f7912d992b30a29902;p=oweals%2Fopenssl.git

Do not implement RC4 stuff if RC4 is disabled.  Concequently, apply the same
rule for SHA stuff.
PR: 381
---

diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index e28951cbc4..09d281c19d 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -84,6 +84,21 @@
 /* #define TEST_ENG_OPENSSL_SHA_P_UPDATE */
 /* #define TEST_ENG_OPENSSL_SHA_P_FINAL */
 
+/* Now check what of those algorithms are actually enabled */
+#ifdef OPENSSL_NO_RC4
+#undef TEST_ENG_OPENSSL_RC4
+#undef TEST_ENG_OPENSSL_RC4_OTHERS
+#undef TEST_ENG_OPENSSL_RC4_P_INIT
+#undef TEST_ENG_OPENSSL_RC4_P_CIPHER
+#endif
+#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA0) || defined(OPENSSL_NO_SHA1)
+#undef TEST_ENG_OPENSSL_SHA
+#undef TEST_ENG_OPENSSL_SHA_OTHERS
+#undef TEST_ENG_OPENSSL_SHA_P_INIT
+#undef TEST_ENG_OPENSSL_SHA_P_UPDATE
+#undef TEST_ENG_OPENSSL_SHA_P_FINAL 
+#endif
+
 #ifdef TEST_ENG_OPENSSL_RC4
 static int openssl_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
 				const int **nids, int nid);