2357. [port] Don't use OpenSSL's engine support in versions before

                        OpenSSL 0.9.7f. [RT #17922]

diff --git a/CHANGES b/CHANGES
index b020e34ad044c52d7f9a51e83991d9c1611cb29b..142f977fab4ee6aac5f90edfcea5bb373df9bfe9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2357.  [port]          Don't use OpenSSL's engine support in versions before
+                       OpenSSL 0.9.7f. [RT #17922]
+
 2356.  [bug]           Builtin mutex profiler was not scalable enough.
                        [RT #17436]
 

diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 6fc6784c66b834f3e17dddd44d8d0bdc6605685a..a5d0cca829923dae530527cf7e77f9a8e07eff16 100644 (file)
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -31,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.19 2008/04/02 23:46:57 tbox Exp $
+ * $Id: openssl_link.c,v 1.20 2008/04/04 22:10:49 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -54,7 +54,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 >= 0x0090707f)
 #define USE_ENGINE 1
 #endif