From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 23 Mar 2016 06:26:31 +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=ed693072583e175eab09e9b9594af70dcf831ade;p=thirdparty%2Fntp.git

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

bk: 56f23717_JxJxV8zjNoIBwls7sHmyQ
---

ed693072583e175eab09e9b9594af70dcf831ade
diff --cc ChangeLog
index 6895cdfab,276732f74..f00f85fcf
--- a/ChangeLog
+++ b/ChangeLog
@@@ -15,11 -3,10 +15,15 @@@
  * [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 3009] Crafted addpeer with hmode > 7 causes OOB error. perlinger@ntp.org
 +   - added more stringent checks on packet content
+ * [Bug 3010] remote configuration trustedkey/requestkey values
+   are not properly validated. perlinger@ntp.org
+   - sidekick: Ignore keys that have an unsupported MAC algorithm
+     but are otherwise well-formed
 +* [Bug 3011] Duplicate IPs on unconfig directives will cause an assertion botch
 +  - graciously accept the same IP multiple times. perlinger@ntp.org
  * [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"