2101. [bug] OpenSSL version checks were not quite right.

                        [RT #16476]

diff --git a/CHANGES b/CHANGES
index 23eaa9c086e40e7fd1bdb0a49cada565e2b767fd..713ef39c40951399660771b2dc6ced6dcaf03823 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2101.  [bug]           OpenSSL version checks were not quite right.
+                       [RT #16476]
+
 2100.  [port]          win32: copy libeay32.dll to Build\Debug.
                        Copy Debug\named-checkzone to Debug\named-compilezone.
 

diff --git a/configure b/configure
index 6bc292606fc71f03607d3a83aaa42c1c8d2698ad..f19d90894b3711845c870a26df6519c28a1b6427 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.339.18.60 2006/10/19 01:05:02 marka Exp $
+# $Id: configure,v 1.339.18.61 2006/11/07 21:30:47 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -5411,7 +5411,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <openssl/opensslv.h>
 int main() {
         if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL &&
-            OPENSSL_VERSION_NUMBER < 0x009080000L) ||
+            OPENSSL_VERSION_NUMBER < 0x00908000L) ||
             OPENSSL_VERSION_NUMBER >= 0x0090804fL)
                 return (0);
        printf("\n\nFound   OPENSSL_VERSION_NUMBER %#010x\n",

diff --git a/configure.in b/configure.in
index 0d36340547d92f5fcce29a56022408d63ecbbe17..8ffd23941880b219523950358eb49c675334cb3b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.355.18.60 $)
+AC_REVISION($Revision: 1.355.18.61 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -496,7 +496,7 @@ yes|'')
 #include <openssl/opensslv.h>
 int main() {
         if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL &&
-            OPENSSL_VERSION_NUMBER < 0x009080000L) ||
+            OPENSSL_VERSION_NUMBER < 0x00908000L) ||
             OPENSSL_VERSION_NUMBER >= 0x0090804fL)
                 return (0);
        printf("\n\nFound   OPENSSL_VERSION_NUMBER %#010x\n",

diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index c3507043eb9a0564ab891167a54a07441a53feb7..2609df6e70675d29410a3160e244ee3f72a626e9 100644 (file)
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.1.6.10 2006/10/11 03:58:14 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.1.6.11 2006/11/07 21:28:49 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -49,7 +49,7 @@
  */
 #ifdef WIN32
 #if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \
-       OPENSSL_VERSION_NUMBER < 0x009080000L) || \
+       OPENSSL_VERSION_NUMBER < 0x00908000L) || \
       OPENSSL_VERSION_NUMBER >= 0x0090804fL)
 #error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater.
 #endif