From 507ffb566b19dc04cf748a30278cd61d5ba964ea Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Sun, 6 Dec 2015 23:05:47 +1100
Subject: [PATCH] bracket mismatch; window openssl version check

---
 configure                 | 2 +-
 configure.in              | 2 +-
 lib/dns/opensslrsa_link.c | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 1c178fb7f0..5cd9f9c2ca 100755
--- a/configure
+++ b/configure
@@ -13799,7 +13799,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 64641100ad..06001abf8b 100644
--- 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 6da37d5330..03ea1bd6eb 100644
--- 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