From: Juergen Perlinger <perlinger@ntp.org>
Date: Sun, 14 Mar 2021 08:31:22 +0000 (+0100)
Subject: [Bug 3724] ntp-keygen with openSSL 1.1.1 fails on Windows
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e41f0758409d376d198d6ec6105f91af7d61a70e;p=thirdparty%2Fntp.git

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

bk: 604dc9daIlp2NOaUgQYi6kfOHMx2dQ
---

diff --git a/ChangeLog b/ChangeLog
index eeceaa9f1..1f065393b 100644
--- 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 693380f01..993d6f664 100644
--- 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