[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  5abb2fc964cc4ea26dbddc8cf334f6958a63ee0f (commit)
      from  effaf4dee90beff07bb40f21d81352304a5e8152 (commit)


- Log -----------------------------------------------------------------
commit 5abb2fc964cc4ea26dbddc8cf334f6958a63ee0f
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Feb 9 19:45:17 2016 -0500

    Don't run RC4 test with no-rc4
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/engine/eng_openssl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index 152c188..7e1a58c 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -683,8 +683,10 @@ static int ossl_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth,
 int openssl_destroy(ENGINE *e)
 {
     test_sha_md_destroy();
+#ifdef TEST_ENG_OPENSSL_RC4
     test_r4_cipher_destroy();
     test_r4_40_cipher_destroy();
+#endif
     return 1;
 }