From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 24 Jan 2016 10:18:39 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a28f23d5bc0ed0a671053971371666c9676e95d1;p=thirdparty%2Fntp.git

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

bk: 56a4a4ffbdc-oO-0ehis9pkHxp-s3g
---

a28f23d5bc0ed0a671053971371666c9676e95d1
diff --cc ChangeLog
index ee752e778,c70fe8fc5..6dabb7901
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,6 +1,14 @@@
  ---
  
 +* [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
  
  ---