Do not implement RC4 stuff if RC4 is disabled. Concequently, apply the same
rule for SHA stuff. PR: 381
This commit is contained in:
parent
4fbe40c54f
commit
439ae4d398
@ -84,6 +84,21 @@
|
|||||||
/* #define TEST_ENG_OPENSSL_SHA_P_UPDATE */
|
/* #define TEST_ENG_OPENSSL_SHA_P_UPDATE */
|
||||||
/* #define TEST_ENG_OPENSSL_SHA_P_FINAL */
|
/* #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
|
#ifdef TEST_ENG_OPENSSL_RC4
|
||||||
static int openssl_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
|
static int openssl_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
|
||||||
const int **nids, int nid);
|
const int **nids, int nid);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user