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

                        [RT #16476]

diff --git a/CHANGES b/CHANGES
index 2dce0cebfb003c4e51ff5953cf07a260e2c582fa..caeaa16d6d0237cc4cb76990082665f4b091fa66 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.
 
        --- 9.3.3rc3 released ---

diff --git a/configure b/configure
index bd89b283f3f37b9e6c771b34beb3973ef1db9199..664a1bb4e99833f2113d4b5e884dffdf869ba34d 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.284.2.19.2.65 2006/10/19 01:11:01 marka Exp $
+# $Id: configure,v 1.284.2.19.2.66 2006/11/07 21:30:59 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.294.2.23.2.70 .
+# From configure.in Revision: 1.294.2.23.2.71 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -5371,7 +5371,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 5f2bbaa307b940f9f0c9f4d0f4214d0aa8d0693d..7035dd30c65a912101618ca33a46a734f8a5ca24 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.294.2.23.2.70 $)
+AC_REVISION($Revision: 1.294.2.23.2.71 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -487,7 +487,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 1025b55e37c85b4fabd09e285ede7f17c53aa0c0..c33913ce3d07b84ed21da30e14b73e3e9acdedf9 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.4.8 2006/10/11 03:59:42 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.1.4.9 2006/11/07 21:28:40 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