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: 5e9d5b6fczwyf3ScspjKwTzaBhvBAw

diff --cc ChangeLog
index 7db79370c2be437e638fc03ea586332671beef48,1d73893e94c236e296d4ef45744fd76e310af8fc..ad08b924745c58ae391d232c61c9705b96ca029b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,8 @@@
  ---
  (4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
  
 +* [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
    ntp_config.h <perlinger@ntp.org>

diff --cc NEWS
index 6b7d2ff4428b7e2c509ed2d138e6446ceb30b5da,35c9236b82374411b6b3137f194290a543e3e783..c678fbc13fa232afb2c8a146d8eb3732381d31ab
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -10,9 -10,9 +10,10 @@@ 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 6 other bugs.
+ It also fixes 7 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
    ntp_config.h <perlinger@ntp.org>