From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 23 Jan 2016 14:28:09 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/mayer/ntp-stable-Bug2995/
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e34368d737f6403c5f6b9101a4e525c4a8746cce;p=thirdparty%2Fntp.git

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

bk: 56a38df9HhObuKRZDWd5Dv_4WNG9gw
---

e34368d737f6403c5f6b9101a4e525c4a8746cce
diff --cc ChangeLog
index 0f867209e,83a50d044..1eedefe89
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,13 +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 2879] Improve NTP security against timing attacks. perlinger@ntp.org
+   - integrated patches by Loganaden Velvidron <logan@ntp.org>
+     with some modifications & unit tests
 +* [Bug 2995] Fixes to compile on Windows
+ 
  ---
  (4.2.8p6) 2016/01/20 Released by Harlan Stenn <stenn@ntp.org>