bracket mismatch; window openssl version check

diff --git a/configure b/configure
index bbe6357bff395e04a33637732457299195c029bb..2dca107251cc4d8e8dcd29e50a4076fd441f1874 100755 (executable)
--- a/configure
+++ b/configure
@@ -13796,7 +13796,7 @@ else
 int main() {
        if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL &&
             OPENSSL_VERSION_NUMBER < 0x00908000L) ||
-            OPENSSL_VERSION_NUMBER >= 0x0090804fL &&
+            (OPENSSL_VERSION_NUMBER >= 0x0090804fL &&
             OPENSSL_VERSION_NUMBER < 0x10002000L) ||
             OPENSSL_VERSION_NUMBER >= 0x1000205fL)
                return (0);

diff --git a/configure.in b/configure.in
index 4e7b919b95bc279f5036c2df1eda8f14fddaf6a1..d89bd6e54386e4506ee3fc7db2316ec5fb1ebae8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -810,7 +810,7 @@ yes|'')
 int main() {
        if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL &&
             OPENSSL_VERSION_NUMBER < 0x00908000L) ||
-            OPENSSL_VERSION_NUMBER >= 0x0090804fL &&
+            (OPENSSL_VERSION_NUMBER >= 0x0090804fL &&
             OPENSSL_VERSION_NUMBER < 0x10002000L) ||
             OPENSSL_VERSION_NUMBER >= 0x1000205fL)
                return (0);

diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 624b082fb00f1e9e2fc0574c7140fe8b26360dc9..f78732d6dc3f79639dad70c9cd86235afdae1a5d 100644 (file)
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -70,7 +70,9 @@
 #ifdef WIN32
 #if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \
        OPENSSL_VERSION_NUMBER < 0x00908000L) || \
-      OPENSSL_VERSION_NUMBER >= 0x0090804fL)
+      (OPENSSL_VERSION_NUMBER >= 0x0090804fL && \
+       OPENSSL_VERSION_NUMBER < 0x10002000L) || \
+      OPENSSL_VERSION_NUMBER >= 0x1000205fL)
 #error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater.
 #endif
 #endif