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

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

bk: 56f23717_JxJxV8zjNoIBwls7sHmyQ

diff --cc ChangeLog
index 6895cdfab81844f3e2716ca7f938988f3f4c3a26,276732f74e7cd060ce54715b7ae7249e2e076756..f00f85fcfdde8331eb47370bf9b6fc2058476b5a
--- 1/ChangeLog
--- 2/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"

diff --cc ntpd/ntp_request.c
Simple merge