diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2020-06-24 01:51:05 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2020-06-24 01:51:05 +0000 |
| commit | 767173cec2b2041e1f847bc8896092f9c1481242 (patch) | |
| tree | f13382cc9f11300231085767f92ffc15a98f8516 /usr.sbin/ntp | |
| parent | 28e002cd3e8a3c40c34a41f8b1ac624d334e4b9a (diff) | |
| parent | 3914721463f70500ecc1f59312b122d8788465cf (diff) | |
| download | src-767173cec2b2041e1f847bc8896092f9c1481242.tar.gz src-767173cec2b2041e1f847bc8896092f9c1481242.zip | |
MFV r362565:
Update 4.2.8p14 --> 4.2.8p15
Summary: Systems that use a CMAC algorithm in ntp.keys will not release
a bit of memory on each packet that uses a CMAC keyid, eventually causing
ntpd to run out of memory and fail. The CMAC cleanup from
https://bugs.ntp.org/3447, part of ntp-4.2.8p11, introduced a bug whereby
the CMAC data structure was no longer completely removed.
MFC after: 3 days
Security: NTP Bug 3661
Notes
Notes:
svn path=/head/; revision=362568
Diffstat (limited to 'usr.sbin/ntp')
| -rw-r--r-- | usr.sbin/ntp/config.h | 6 | ||||
| -rwxr-xr-x | usr.sbin/ntp/scripts/mkver | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 62a677d4b705..a7aaa24467a5 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1468,7 +1468,7 @@ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.8p14" +#define PACKAGE_STRING "ntp 4.2.8p15" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" @@ -1477,7 +1477,7 @@ #define PACKAGE_URL "http://www.ntp.org./" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.2.8p14" +#define PACKAGE_VERSION "4.2.8p15" /* data dir */ #define PERLLIBDIR "/usr/share/ntp/lib" @@ -1650,7 +1650,7 @@ typedef unsigned int uintptr_t; /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.8p12" +#define VERSION "4.2.8p15" /* vsnprintf expands "%m" to strerror(errno) */ #define VSNPRINTF_PERCENT_M 1 diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index 2d3e39dbd034..f193db55f1b4 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -8,7 +8,7 @@ PROG=${1-UNKNOWN} ConfStr="$PROG" -ConfStr="$ConfStr 4.2.8p12" +ConfStr="$ConfStr 4.2.8p15" case "$CSET" in '') ;; |