From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 5 May 2020 03:54:56 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e88d4714bdaeeefbc13196f6148438c52c3e515;p=thirdparty%2Fntp.git

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

bk: 5eb0e390Mm3gIuT5WJz36m8kU91Msw
---

1e88d4714bdaeeefbc13196f6148438c52c3e515
diff --cc NEWS
index c678fbc13,2106bb390..4215ce0a4
--- a/NEWS
+++ b/NEWS
@@@ -10,9 -10,8 +10,9 @@@ authentication between ntpd from versio
  4.2.8p14/4.3.100 will leak a small amount of memory for each packet.
  Eventually, ntpd will run out of memory and abort.
  
- It also fixes 7 other bugs.
+ It also fixes 8 other bugs.
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
  * [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>
  * [Bug 3662] Fix build errors on Windows with VS2008 <burnicki@ntp.org>
  * [Bug 3659] Move definition of psl[] from ntp_config.h to