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

                        [RT #16476]

diff --git a/CHANGES b/CHANGES
index 51a66ee0f07a9b12e1b7bfac5f76bd6bc1f16fdd..6582f47da33e812678d591d42adce23a2d07efd4 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 90a4bfe8bdb1e885517893e020c2b727395ad4bb..bccbcfb8d6f49591891dc97925d612b3f8f74e5f 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.403 2006/10/19 01:02:14 marka Exp $
+# $Id: configure,v 1.404 2006/11/07 21:23:06 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.415 .
+# From configure.in Revision: 1.416 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -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 1f11d5b1edc845aa1b54a21ed65e94bbdfa98697..e4c1fba9f7f356a53ef1f66258c42c24e1545eaf 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.415 $)
+AC_REVISION($Revision: 1.416 $)
 
 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 1c0c6a674808adbe0720426821976937f5b27df1..3137c5f0d2f12326088c60268d968e21f1e68657 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.11 2006/10/11 03:54:56 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.12 2006/11/07 21:22:11 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