From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 11 Dec 2013 14:45:12 +0000 (+0000)
Subject: Don't use rdrand engine as default unless explicitly requested.
X-Git-Tag: OpenSSL_1_0_1f~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1c2c5e402a757a63d690bd2390bd6b8b491ef184;p=oweals%2Fopenssl.git

Don't use rdrand engine as default unless explicitly requested.
(cherry picked from commit 8f68678989a198ead3ab59a698302ecb0f1c8fb1)
---

diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c
index a9ba5ae6f9..4e9e91d54b 100644
--- a/crypto/engine/eng_rdrand.c
+++ b/crypto/engine/eng_rdrand.c
@@ -104,6 +104,7 @@ static int bind_helper(ENGINE *e)
 	{
 	if (!ENGINE_set_id(e, engine_e_rdrand_id) ||
 	    !ENGINE_set_name(e, engine_e_rdrand_name) ||
+            !ENGINE_set_flags(e, ENGINE_FLAGS_NO_REGISTER_ALL) ||
 	    !ENGINE_set_init_function(e, rdrand_init) ||
 	    !ENGINE_set_RAND(e, &rdrand_meth) )
 		return 0;