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

                        openssl engine support. [RT #16030]

diff --git a/CHANGES b/CHANGES
index 81490aafedba8949a8467e9c348d0aebbc8d52f3..8146317e4edc3eaae7c34c3e18e6d8a33e60dda2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2030.  [bug]           We were being overly conservative when disabling
+                       openssl engine support. [RT #16030]
+
 2028.  [port]          linux: socket.c compatability for old systems.
                        [RT #16015]
 

diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 5439c623b3823ffd40c6d1d68891c55b8c39849a..7a521db456df67fe6e94c6472e4c2b6db27464dc 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.2.1 2004/12/09 03:18:18 marka Exp $
+ * $Id: openssl_link.c,v 1.1.2.2 2006/05/23 04:52:13 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -37,7 +37,7 @@
 #include <openssl/rand.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
 
@@ -130,7 +130,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