Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

into  psp-deb1.ntp.org:/home/mayer/ntp-stable-Bug3007

bk: 56ca6e06fYReDCjomGx_Od9DR1-8iQ

diff --cc ChangeLog
index 02595482f1706eedecd55bcd2034336b3149a6b0,56039d3c99f442c0f40c465420a463a3ecae0e98..593b0cd563ee1af6ae61ab5c4431042ee228ff3f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,8 +1,27 @@@
  ---
  
 +* [Sec 2901] KoD packets must have non-zero transmit timestamps.  HStenn.
 +* [Sec 2936] Skeleton Key: Any system knowing the trusted key can serve
 +  time. Include passive servers in this check. HStenn.
 +* [Sec 2945] Additional KoD packet checks.  HStenn.
 +* [Bug 2858] bool support.  Use stdbool.h when available.  HStenn.
 +* [Bug 2879] Improve NTP security against timing attacks. perlinger@ntp.org
 +  - integrated patches by Loganaden Velvidron <logan@ntp.org>
 +    with some modifications & unit tests
  * [Bug 2994] Systems with HAVE_SIGNALED_IO fail to compile. perlinger@ntp.org
  * [Bug 2995] Fixes to compile on Windows
 +* [Bug 2999] out-of-bounds access in 'is_safe_filename()'. perlinger@ntp.org
+ * [Bug 3007] Validate crypto-NAKs
 +* [Bug 3013] Fix for ssl_init.c SHA1 test. perlinger@ntp.org
 +  - Patch provided by Ch. Weisgerber
 +* [Bug 3015] ntpq: config-from-file: "request contains an unprintable character"
 +  - A change related to [Bug 2853] forbids trailing white space in
 +    remote config commands. perlinger@ntp.org
 +* Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 +* Update html/xleave.html documentation.  Harlan Stenn.
 +* Update ntp.conf documentation.  Harlan Stenn.
 +* Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
 +* Fix typo in html/monopt.html.  Harlan Stenn.
  
  ---
  (4.2.8p6) 2016/01/20 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntp_proto.c
Simple merge