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

diff --cc ChangeLog
index df8ee65fec6a0818a6c7795182de17a8946e3a75,dad61610eb38c0c609acf1b046d1b74f177fea4a..e7bf35a632d26a7afa59c6bd3f7d049e44fcb53d
--- 1/ChangeLog
--- 2/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

diff --cc libntp/a_md5encrypt.c
Simple merge

diff --cc ntpq/ntpq.c
Simple merge