From: Mark Andrews <marka@isc.org>
Date: Tue, 23 May 2006 04:50:52 +0000 (+0000)
Subject: 2030.   [bug]           We were being overly conservative when disabling
X-Git-Tag: v9.4.0a6~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e0b69bf491a4203be2645425d81a68a25d4f8ef;p=thirdparty%2Fbind9.git

2030.   [bug]           We were being overly conservative when disabling
                        openssl engine support. [RT #16030]
---

diff --git a/CHANGES b/CHANGES
index 6183c38d9f9..ae0819e5db7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2030.	[bug]		We were being overly conservative when disabling
+			openssl engine support. [RT #16030]
+
 2029.	[bug]		host printed out the server multiple times when
 			specified on the command line. [RT #15992]
 
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index fee4fd30aa5..f51fe255900 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.1.6.7 2005/09/01 03:04:28 marka Exp $
+ * $Id: openssl_link.c,v 1.1.6.8 2006/05/23 04:50:52 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -41,7 +41,7 @@
 #include <openssl/conf.h>
 #include <openssl/crypto.h>
 
-#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER < 0x00907000L)
+#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER != 0x00907000L)
 #define USE_ENGINE 1
 #endif
 
@@ -167,7 +167,7 @@ dst__openssl_init() {
 		goto cleanup_rm;
 	}
 	ENGINE_set_RAND(e, rm);
-	RAND_set_rand_method(e);
+	RAND_set_rand_method(rm);
 #else
 	RAND_set_rand_method(rm);
 #endif