[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 62b527bb6dd969a1fa03dd1e8abb3d04059df39d..5b9255d9e8b25ae89099a9316ebdf8a676034d2b 100644 (file)
--- 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 e409f3421f8209d35f096ecb2cc239c688f15742..93760f787f9bcb0b90b66d3bf19ec8c60c566a90 100644 (file)
--- 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 c0fc7c2fd1074b546c324c49fe40e8deef15f29a..2b9bc64caf5323cffb177632b25b903174a045b8 100644 (file)
--- 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