From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 8 Apr 2018 07:35:05 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P12~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f82cbe8aab831c8890636b869619c545cd2ba73;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3471

bk: 5ac9c629ZACbo8p7ZzZ_4dpJV_NMZQ
---

1f82cbe8aab831c8890636b869619c545cd2ba73
diff --cc ChangeLog
index df8ee65fe,dad61610e..e7bf35a63
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,8 +1,17 @@@
  ---
  
 +* [Bug 3470] ntpd4.2.8p11 fails to compile without OpenSSL <perlinger@ntp.org>
 +* [Bug 3465] Default TTL values cannot be used <perlinger@ntp.org>
 +* [Bug 3456] Use uintptr_t rather than size_t to store an integer in a pointer
 + - According to Brooks Davis, there was only one location <perlinger@ntp.org>
 +* [Bug 2821] minor build issues <perlinger@ntp.org>
 + - applied patches by Christos Zoulas, including real bug fixes
 +
 +---
++
+ * [Bug 3471] Check for openssl/[ch]mac.h.  HStenn.
+   - add #define ENABLE_CMAC support in configure.  HStenn.
+ ---
  (4.2.8p11) 2018/02/27 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Sec 3454] Unauthenticated packet can reset authenticated interleave