2030. [bug] We were being overly conservative when disabling

                        openssl engine support. [RT #16030]

diff --git a/CHANGES b/CHANGES
index 6183c38d9f9af4c62558283f6bf07834d5e57925..ae0819e5db7bbae2a53b691aee652a6d04715f22 100644 (file)
--- 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 fee4fd30aa5281420f16f4e8d469cd08e0d08f4f..f51fe2559005dbbe742827ba3d61271f37f5e1dc 100644 (file)
--- 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