From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 4 May 2023 10:51:51 +0000 (-0500)
Subject: Merge ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/perlinger/ntp-stable-3808
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d25d9dbf41ff6ffb8ee4a5a01a808c7290124313;p=thirdparty%2Fntp.git

Merge ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/perlinger/ntp-stable-3808
into  ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable-3808

bk: 64538e47DYu28HTlB4KLbgOsG5vz8w
---

d25d9dbf41ff6ffb8ee4a5a01a808c7290124313
diff --cc ChangeLog
index 30d67fe97,4f8b7c360..3d2f817b5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,5 +1,11 @@@
  ---
 -* [Bug 3808] Assertion failure in ntpq on malformed RT-11 date <perlinger@ntp.org>
 +* [Bug 3814] First poll delay of new or cleared associations miscalculated.
 +             <hart@ntp.org>
++* [Sec 3808] Assertion failure in ntpq on malformed RT-11 date <perlinger@ntp.org>
 +* [Sec 3807] praecis_parse() in the Palisade refclock driver has a
 +             hypothetical input buffer overflow. Reported by ... stenn@
 +* [Sec 3806] libntp/mstolfp.c needs bounds checking <perlinger@ntp.org>
 +  - solved numerically instead of using string manipulation
  * [Bug 3802] ntp-keygen -I default identity modulus bits too small for
               OpenSSL 3.  Reported by rmsh1216@163.com <hart@ntp.org>
  * [Bug 3801] gpsdjson refclock gps_open() device name mishandled. <hart@ntp.org>