From: Juergen Perlinger <perlinger@ntp.org>
Date: Sat, 21 Jan 2017 14:12:35 +0000 (+0100)
Subject: [Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=091d81c8ac2a544caaca27ee753d7418af65a1d2;p=thirdparty%2Fntp.git

[Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
 - pulled missing changeset, minor warning fixes

bk: 58836c53oNokappicxWu8jr4StiDUg
---

diff --git a/ChangeLog b/ChangeLog
index 62b527bb6..5b9255d9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---
 * [Bug 3144] NTP does not build without openSSL <perlinger@ntp.org>
-
+  - added missed changeset for automatic openssl lib detection
+  - fixed some minor warning issues
 ---
 (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/include/ssl_applink.c b/include/ssl_applink.c
index e409f3421..93760f787 100644
--- a/include/ssl_applink.c
+++ b/include/ssl_applink.c
@@ -28,6 +28,7 @@
 void *wrap_dbg_malloc(size_t s, const char *f, int l);
 void *wrap_dbg_realloc(void *p, size_t s, const char *f, int l);
 void wrap_dbg_free(void *p);
+void wrap_dbg_free_ex(void *p, const char *f, int l);
 #endif
 
 
@@ -40,7 +41,7 @@ ssl_applink(void)
 {
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
 #   ifdef WRAP_DBG_MALLOC
-	CRYPTO_set_mem_functions(wrap_dbg_malloc, wrap_dbg_realloc, wrap_dbg_free);
+	CRYPTO_set_mem_functions(wrap_dbg_malloc, wrap_dbg_realloc, wrap_dbg_free_ex);
 #   else
 	OPENSSL_malloc_init();
 #   endif
@@ -83,4 +84,11 @@ void wrap_dbg_free(void *p)
 {
 	_free_dbg(p, _NORMAL_BLOCK);
 }
+
+void wrap_dbg_free_ex(void *p, const char *f, int l)
+{
+	(void)f;
+	(void)l;
+	_free_dbg(p, _NORMAL_BLOCK);
+}
 #endif	/* WRAP_DBG_MALLOC */
diff --git a/ports/winnt/ntpd/ntservice.c b/ports/winnt/ntpd/ntservice.c
index c0fc7c2fd..2b9bc64ca 100644
--- a/ports/winnt/ntpd/ntservice.c
+++ b/ports/winnt/ntpd/ntservice.c
@@ -55,6 +55,7 @@ void ntservice_exit(void);
 void *wrap_dbg_malloc(size_t s, const char *f, int l);
 void *wrap_dbg_realloc(void *p, size_t s, const char *f, int l);
 void wrap_dbg_free(void *p);
+void wrap_dbg_free_ex(void *p, const char *f, int l);
 #endif
 
 void WINAPI