From a12a21a8432222f951695b7bb44efb1275fc29a8 Mon Sep 17 00:00:00 2001 From: Mark Andrews 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 389d9d8b48..b426a81f08 100755 --- a/configure +++ b/configure @@ -15775,7 +15775,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 2b556ac37f..f29bb05dc0 100644 --- a/configure.in +++ b/configure.in @@ -1542,7 +1542,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 46049d7163..405d333c28 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