From: Harlan Stenn Date: Tue, 9 Jun 2020 11:19:41 +0000 (-0400) Subject: Merge psp-deb2.ntp.org:/home/stenn/ntp-stable-p15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2228a01adffc60811ccb344459149c539b7fb39f;p=thirdparty%2Fntp.git Merge psp-deb2.ntp.org:/home/stenn/ntp-stable-p15 into psp-deb2.ntp.org:/home/stenn/ntp-stable-p15-sec bk: 5edf704d9IwvfOkGfc2otlwO1196AQ --- 2228a01adffc60811ccb344459149c539b7fb39f diff --cc ChangeLog index acbab4ed2,498303787..136bf0847 --- a/ChangeLog +++ b/ChangeLog @@@ -1,7 -1,9 +1,10 @@@ --- -(4.2.8p15) 2020/04/xx Released by Harlan Stenn +(4.2.8p15) 2020/06/23 Released by Harlan Stenn +* [Sec 3661] memory leak with AES128CMAC keys + * [Bug 3670] Regression from bad merge of 3592 and 3596 + - fixed a bad merge that happened before 4.2.8-p14. Thanks to + Sylar Tao for noticing this! * [Bug 3667] decodenetnum fails with numeric port - rewrite 'decodenetnum()' in terms of inet_pton * [Bug 3666] avoid unlimited receive buffer allocation diff --cc NEWS index 28d1321ee,30173d721..caf9ea664 --- a/NEWS +++ b/NEWS @@@ -10,9 -10,10 +10,11 @@@ 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 12 other bugs. + It also fixes 13 other bugs. +* [Sec 3661] memory leak with AES128CMAC keys + * [Bug 3670] Regression from bad merger between 3592 and 3596 + - Thanks to Sylar Tao * [Bug 3667] decodenetnum fails with numeric port - rewrite 'decodenetnum()' in terms of inet_pton * [Bug 3666] avoid unlimited receive buffer allocation