[Bug 3724] ntp-keygen with openSSL 1.1.1 fails on Windows

bk: 604dc9daIlp2NOaUgQYi6kfOHMx2dQ

diff --git a/ChangeLog b/ChangeLog
index eeceaa9f10cb57b56caf561eaab50a81ec861f63..1f065393b8b3a1a586a01fa1a03e3701455592d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+* [Bug 3724] ntp-keygen with openSSL 1.1.1 fails on Windows <perlinger@ntp.org>
+  - openssl applink needed again for openSSL-1.1.1
+
 ---
 (4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/include/ssl_applink.c b/include/ssl_applink.c
index 693380f01051210e3551bb76f5a95618d41def90..993d6f664e3bda7b0c05248c0e9a9888181992b5 100644 (file)
--- a/include/ssl_applink.c
+++ b/include/ssl_applink.c
@@ -14,7 +14,7 @@
 #   include "msvc_ssl_autolib.h"
 #  endif
 # endif
-# if OPENSSL_VERSION_NUMBER < 0x10100000L
+# if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_VERSION_NUMBER >= 0x10101000L
 #  include <openssl/applink.c>
 # endif
 # ifdef _MSC_VER