From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 8 Apr 2017 09:19:53 +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=98862154ac214ee2246c27f89c577e30ca6aff27;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-aes128cmac

bk: 58e8ab394JMFSZ1KNhzSs602bDlo2Q
---

98862154ac214ee2246c27f89c577e30ca6aff27
diff --cc ChangeLog
index 1fdaaf35e,8486ad127..ae2fd1954
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,10 +1,11 @@@
  ---
  
 +* AES-128-CMAC support
+ * [Bug 3358] Spurious KoD log messages in .INIT. phase.  HStenn.
  
  ---
- (4.2.8p10)
+ (4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>
  
- * [Sec 3393] clang scan-build findings <perlinger@ntp.org>
  * [Sec 3389] NTP-01-016: Denial of Service via Malformed Config
    (Pentest report 01.2017) <perlinger@ntp.org>
  * [Sec 3388] NTP-01-014: Buffer Overflow in DPTS Clock