From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 21 Jan 2016 06:40:56 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-2879
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=837334850eb8ed55ecf976083b915b8236587353;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-2879
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p6

bk: 56a07d78UkwdwQYDACnvYHg5cNns7A
---

837334850eb8ed55ecf976083b915b8236587353
diff --cc ChangeLog
index cfe4aa186,e2807d0f8..179123824
--- a/ChangeLog
+++ b/ChangeLog
@@@ -53,8 -18,11 +53,11 @@@
  * CID 1341682: Nit in libntp/authreadkeys.c.  HStenn.
  * CID 1341684: Nit in tests/ntpd/t-ntp_signd.c.  HStenn.
  * [Bug 2829] Look at pipe_fds in ntpd.c  (did so. perlinger@ntp.org)
+ * [Bug 2879] Improve NTP security against timing attacks. perlinger@ntp.org
+   - integrated patches by Loganaden Velvidron <loganaden@gmail.com>
+     with some modifications & unit tests
  * [Bug 2887] stratum -1 config results as showing value 99
 -  - fudge stratum only accepts values [0..16]. perlinger@ntp.org
 +  - fudge stratum should only accept values [0..16]. perlinger@ntp.org
  * [Bug 2932] Update leapsecond file info in miscopt.html.  CWoodbury, HStenn.
  * [Bug 2934] tests/ntpd/t-ntp_scanner.c has a magic constant wired in.  HMurray
  * [Bug 2944] errno is not preserved properly in ntpdate after sendto call.