diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2023-06-06 12:26:44 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2023-06-06 12:26:44 +0000 |
| commit | ab1f1aa8333369a83ff284848fc3fc2e52d5f29f (patch) | |
| tree | 8de0df35223a84db835405875d51153733035d28 | |
| parent | 26fd3d5616df1ccc17b6e487b1db4633dfdd555b (diff) | |
| download | src-vendor/ntp.tar.gz src-vendor/ntp.zip | |
ntp: import ntp-4.2.8p17vendor/ntp/4.2.8p17vendor/ntp
140 files changed, 1546 insertions, 400 deletions
diff --git a/ChangeLog b/ChangeLog index 8e34d2a96696..93cdab8b94eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,18 @@ --- +(4.2.8p17) 2023/06/06 Released by Harlan Stenn <stenn@ntp.org> + +* [Bug 3824] Spurious "ntpd: daemon failed to notify parent!" logged at + event_sync. Reported by Edward McGuire. <hart@ntp.org> +* [Bug 3822] ntpd significantly delays first poll of servers specified by name. + <hart@ntp.org> Miroslav Lichvar identified regression in 4.2.8p16. +* [Bug 3821] 4.2.8p16 misreads hex authentication keys, won't interop with + 4.2.8p15 or earlier. Reported by Matt Nordhoff, thanks to + Miroslav Lichvar and Matt for rapid testing and identifying the + problem. <hart@ntp.org> +* Add tests/libntp/digests.c to catch regressions reading keys file or with + symmetric authentication digest output. + +--- (4.2.8p16) 2023/05/31 Released by Harlan Stenn <stenn@ntp.org> * [Sec 3808] Assertion failure in ntpq on malformed RT-11 date <perlinger@ntp.org> diff --git a/CommitLog b/CommitLog index 54bf0f9a45fc..adeda2c60402 100644 --- a/CommitLog +++ b/CommitLog @@ -1,3 +1,467 @@ +ChangeSet@1.4004, 2023-06-06 04:40:27-07:00, ntpreleng@ntp-build.tal1.ntfo.org + NTP_4_2_8P17 + TAG: NTP_4_2_8P17 + + ChangeLog@1.2053 +1 -0 + NTP_4_2_8P17 + + ntpd/invoke-ntp.conf.texi@1.225 +1 -1 + NTP_4_2_8P17 + + ntpd/invoke-ntp.keys.texi@1.210 +1 -1 + NTP_4_2_8P17 + + ntpd/invoke-ntpd.texi@1.524 +2 -2 + NTP_4_2_8P17 + + ntpd/ntp.conf.5man@1.259 +2 -2 + NTP_4_2_8P17 + + ntpd/ntp.conf.5mdoc@1.259 +2 -2 + NTP_4_2_8P17 + + ntpd/ntp.conf.html@1.207 +1 -1 + NTP_4_2_8P17 + + ntpd/ntp.conf.man.in@1.259 +2 -2 + NTP_4_2_8P17 + + ntpd/ntp.conf.mdoc.in@1.259 +2 -2 + NTP_4_2_8P17 + + ntpd/ntp.keys.5man@1.244 +2 -2 + NTP_4_2_8P17 + + ntpd/ntp.keys.5mdoc@1.244 +2 -2 + NTP_4_2_8P17 + + ntpd/ntp.keys.html@1.204 +1 -1 + NTP_4_2_8P17 + + ntpd/ntp.keys.man.in@1.244 +2 -2 + NTP_4_2_8P17 + + ntpd/ntp.keys.mdoc.in@1.244 +2 -2 + NTP_4_2_8P17 + + ntpd/ntpd-opts.c@1.549 +7 -7 + NTP_4_2_8P17 + + ntpd/ntpd-opts.h@1.548 +3 -3 + NTP_4_2_8P17 + + ntpd/ntpd.1ntpdman@1.353 +2 -2 + NTP_4_2_8P17 + + ntpd/ntpd.1ntpdmdoc@1.353 +2 -2 + NTP_4_2_8P17 + + ntpd/ntpd.html@1.198 +2 -2 + NTP_4_2_8P17 + + ntpd/ntpd.man.in@1.353 +2 -2 + NTP_4_2_8P17 + + ntpd/ntpd.mdoc.in@1.353 +2 -2 + NTP_4_2_8P17 + + ntpdc/invoke-ntpdc.texi@1.523 +2 -2 + NTP_4_2_8P17 + + ntpdc/ntpdc-opts.c@1.544 +7 -7 + NTP_4_2_8P17 + + ntpdc/ntpdc-opts.h@1.543 +3 -3 + NTP_4_2_8P17 + + ntpdc/ntpdc.1ntpdcman@1.354 +2 -2 + NTP_4_2_8P17 + + ntpdc/ntpdc.1ntpdcmdoc@1.354 +2 -2 + NTP_4_2_8P17 + + ntpdc/ntpdc.html@1.368 +2 -2 + NTP_4_2_8P17 + + ntpdc/ntpdc.man.in@1.354 +2 -2 + NTP_4_2_8P17 + + ntpdc/ntpdc.mdoc.in@1.354 +2 -2 + NTP_4_2_8P17 + + ntpq/invoke-ntpq.texi@1.533 +2 -2 + NTP_4_2_8P17 + + ntpq/ntpq-opts.c@1.553 +7 -7 + NTP_4_2_8P17 + + ntpq/ntpq-opts.h@1.551 +3 -3 + NTP_4_2_8P17 + + ntpq/ntpq.1ntpqman@1.361 +2 -2 + NTP_4_2_8P17 + + ntpq/ntpq.1ntpqmdoc@1.361 +2 -2 + NTP_4_2_8P17 + + ntpq/ntpq.html@1.198 +2 -2 + NTP_4_2_8P17 + + ntpq/ntpq.man.in@1.361 +2 -2 + NTP_4_2_8P17 + + ntpq/ntpq.mdoc.in@1.361 +2 -2 + NTP_4_2_8P17 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.523 +1 -1 + NTP_4_2_8P17 + + ntpsnmpd/ntpsnmpd-opts.c@1.544 +7 -7 + NTP_4_2_8P17 + + ntpsnmpd/ntpsnmpd-opts.h@1.543 +3 -3 + NTP_4_2_8P17 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.352 +2 -2 + NTP_4_2_8P17 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.352 +2 -2 + NTP_4_2_8P17 + + ntpsnmpd/ntpsnmpd.html@1.190 +1 -1 + NTP_4_2_8P17 + + ntpsnmpd/ntpsnmpd.man.in@1.352 +2 -2 + NTP_4_2_8P17 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.352 +2 -2 + NTP_4_2_8P17 + + packageinfo.sh@1.550 +2 -2 + NTP_4_2_8P17 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.113 +2 -2 + NTP_4_2_8P17 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.115 +2 -2 + NTP_4_2_8P17 + + scripts/calc_tickadj/calc_tickadj.html@1.114 +1 -1 + NTP_4_2_8P17 + + scripts/calc_tickadj/calc_tickadj.man.in@1.112 +2 -2 + NTP_4_2_8P17 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.115 +2 -2 + NTP_4_2_8P17 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.117 +1 -1 + NTP_4_2_8P17 + + scripts/invoke-plot_summary.texi@1.135 +2 -2 + NTP_4_2_8P17 + + scripts/invoke-summary.texi@1.134 +2 -2 + NTP_4_2_8P17 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.346 +2 -2 + NTP_4_2_8P17 + + scripts/ntp-wait/ntp-wait-opts@1.82 +2 -2 + NTP_4_2_8P17 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.341 +2 -2 + NTP_4_2_8P17 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.343 +2 -2 + NTP_4_2_8P17 + + scripts/ntp-wait/ntp-wait.html@1.362 +2 -2 + NTP_4_2_8P17 + + scripts/ntp-wait/ntp-wait.man.in@1.341 +2 -2 + NTP_4_2_8P17 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.343 +2 -2 + NTP_4_2_8P17 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.132 +2 -2 + NTP_4_2_8P17 + + scripts/ntpsweep/ntpsweep-opts@1.85 +2 -2 + NTP_4_2_8P17 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.120 +2 -2 + NTP_4_2_8P17 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.120 +2 -2 + NTP_4_2_8P17 + + scripts/ntpsweep/ntpsweep.html@1.134 +2 -2 + NTP_4_2_8P17 + + scripts/ntpsweep/ntpsweep.man.in@1.120 +2 -2 + NTP_4_2_8P17 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.121 +2 -2 + NTP_4_2_8P17 + + scripts/ntptrace/invoke-ntptrace.texi@1.135 +2 -2 + NTP_4_2_8P17 + + scripts/ntptrace/ntptrace-opts@1.85 +2 -2 + NTP_4_2_8P17 + + scripts/ntptrace/ntptrace.1ntptraceman@1.120 +2 -2 + NTP_4_2_8P17 + + scripts/ntptrace/ntptrace.1ntptracemdoc@1.122 +2 -2 + NTP_4_2_8P17 + + scripts/ntptrace/ntptrace.html@1.135 +2 -2 + NTP_4_2_8P17 + + scripts/ntptrace/ntptrace.man.in@1.120 +2 -2 + NTP_4_2_8P17 + + scripts/ntptrace/ntptrace.mdoc.in@1.123 +2 -2 + NTP_4_2_8P17 + + scripts/plot_summary-opts@1.86 +2 -2 + NTP_4_2_8P17 + + scripts/plot_summary.1plot_summaryman@1.133 +2 -2 + NTP_4_2_8P17 + + scripts/plot_summary.1plot_summarymdoc@1.133 +2 -2 + NTP_4_2_8P17 + + scripts/plot_summary.html@1.137 +2 -2 + NTP_4_2_8P17 + + scripts/plot_summary.man.in@1.133 +2 -2 + NTP_4_2_8P17 + + scripts/plot_summary.mdoc.in@1.133 +2 -2 + NTP_4_2_8P17 + + scripts/summary-opts@1.85 +2 -2 + NTP_4_2_8P17 + + scripts/summary.1summaryman@1.132 +2 -2 + NTP_4_2_8P17 + + scripts/summary.1summarymdoc@1.132 +2 -2 + NTP_4_2_8P17 + + scripts/summary.html@1.136 +2 -2 + NTP_4_2_8P17 + + scripts/summary.man.in@1.132 +2 -2 + NTP_4_2_8P17 + + scripts/summary.mdoc.in@1.132 +2 -2 + NTP_4_2_8P17 + + scripts/update-leap/invoke-update-leap.texi@1.33 +1 -1 + NTP_4_2_8P17 + + scripts/update-leap/update-leap-opts@1.35 +2 -2 + NTP_4_2_8P17 + + scripts/update-leap/update-leap.1update-leapman@1.33 +2 -2 + NTP_4_2_8P17 + + scripts/update-leap/update-leap.1update-leapmdoc@1.34 +2 -2 + NTP_4_2_8P17 + + scripts/update-leap/update-leap.html@1.33 +1 -1 + NTP_4_2_8P17 + + scripts/update-leap/update-leap.man.in@1.33 +2 -2 + NTP_4_2_8P17 + + scripts/update-leap/update-leap.mdoc.in@1.34 +2 -2 + NTP_4_2_8P17 + + sntp/invoke-sntp.texi@1.523 +2 -2 + NTP_4_2_8P17 + + sntp/sntp-opts.c@1.545 +7 -7 + NTP_4_2_8P17 + + sntp/sntp-opts.h@1.543 +3 -3 + NTP_4_2_8P17 + + sntp/sntp.1sntpman@1.358 +2 -2 + NTP_4_2_8P17 + + sntp/sntp.1sntpmdoc@1.358 +2 -2 + NTP_4_2_8P17 + + sntp/sntp.html@1.539 +2 -2 + NTP_4_2_8P17 + + sntp/sntp.man.in@1.358 +2 -2 + NTP_4_2_8P17 + + sntp/sntp.mdoc.in@1.358 +2 -2 + NTP_4_2_8P17 + + util/invoke-ntp-keygen.texi@1.526 +2 -2 + NTP_4_2_8P17 + + util/ntp-keygen-opts.c@1.547 +7 -7 + NTP_4_2_8P17 + + util/ntp-keygen-opts.h@1.545 +3 -3 + NTP_4_2_8P17 + + util/ntp-keygen.1ntp-keygenman@1.354 +2 -2 + NTP_4_2_8P17 + + util/ntp-keygen.1ntp-keygenmdoc@1.354 +2 -2 + NTP_4_2_8P17 + + util/ntp-keygen.html@1.199 +2 -2 + NTP_4_2_8P17 + + util/ntp-keygen.man.in@1.354 +2 -2 + NTP_4_2_8P17 + + util/ntp-keygen.mdoc.in@1.354 +2 -2 + NTP_4_2_8P17 + +ChangeSet@1.4003, 2023-06-06 04:28:11-07:00, ntpreleng@ntp-build.tal1.ntfo.org + p17 + + tests/libntp/run-digests.c@1.2 +7 -7 + p17 + +ChangeSet@1.4002, 2023-06-06 04:09:35-07:00, ntpreleng@ntp-build.tal1.ntfo.org + p17 + + packageinfo.sh@1.549 +1 -1 + p17 + +ChangeSet@1.4001, 2023-06-06 09:43:55+00:00, hart@ntp-devbuild.chi1.ntfo.org + Makefile.am: + Fix make distcheck failure with generated srcdir.c + + tests/libntp/Makefile.am@1.104 +2 -2 + Fix make distcheck failure with generated srcdir.c + +ChangeSet@1.4000, 2023-06-06 03:43:29-05:00, stenn@stenn.chi1.ntfo.org + prep for p17 + + ChangeLog@1.2052 +8 -6 + prep for p17 + + NEWS@1.219 +25 -0 + prep for p17 + +ChangeSet@1.3998, 2023-06-05 00:21:10+00:00, davehart@tl.davehart.net + Add tests for loading and using all supported symmetric auth digests. + + ChangeLog@1.2050 +2 -0 + Add tests/libntp/digests.c to catch regressions reading keys file or with + symmetric authentication digest output. + + include/ntp.h@1.235 +1 -1 + move KEY_TYPE_MD5 to ntp_md5.h + + include/ntp_md5.h@1.15 +4 -0 + move a few items here where they better fit. + + include/ntp_stdlib.h@1.91 +21 -18 + Move items to ntp_md5.h, add some arg names to prototypes. + + libntp/a_md5encrypt.c@1.55 +13 -10 + %zu isn't supported by all compilers we support + + libntp/authkeys.c@1.46 +11 -12 + Get rid of magic number 4 for sizeof(u_int32), use zero_mem() + + libntp/authreadkeys.c@1.36 +10 -2 + Warn if AES128CMAC key is less than 128 bits. + + libntp/msyslog.c@1.57 +3 -2 + Comment grammar + + libparse/clk_hopf6021.c@1.14 +3 -2 + include ascii.h after ntp_stdlib.h to avoid clash with EM define + + libparse/clk_wharton.c@1.13 +3 -2 + include ascii.h after ntp_stdlib.h to avoid clash with EM define + + ntpd/ntp_control.c@1.241 +0 -1 + ntp_md5.h in ntp_stdlib.h now + + ntpd/ntp_loopfilter.c@1.197 +0 -3 + Move PATH_MAX definition to header file. + + sntp/crypto.c@1.42 +0 -5 + Remove redundancies + + sntp/crypto.h@1.15 +0 -1 + separate include of ntp_md5.h no longer needed + + tests/libntp/Makefile.am@1.103 +33 -6 + add digests.c + + tests/libntp/data/ntp.keys@1.2 +1 -1 + typo + + tests/libntp/digests.c@1.1 +415 -0 + Unit test for loading and using all supported symmetric auth methods. + + tests/libntp/digests.c@1.0 +0 -0 + + tests/libntp/run-digests.c@1.1 +80 -0 + Unity generated runner for digests.c + + tests/libntp/run-digests.c@1.0 +0 -0 + +ChangeSet@1.3996.2.1, 2023-06-03 22:48:12+00:00, davehart@tl.davehart.net + [Bug 3822] ntpd significantly delays first poll of servers specified by name. + + ChangeLog@1.2048.2.1 +4 -0 + [Bug 3822] ntpd significantly delays first poll of servers specified by name. + + ntpd/ntp_config.c@1.383 +18 -0 + Treat associations from ntp.conf with hostnames the same as those with IP addresses. + +ChangeSet@1.3996.1.1, 2023-06-02 23:42:10+00:00, davehart@tl.davehart.net + [Bug 3824] Spurious "ntpd: daemon failed to notify parent!" logged at event_sync. + + ChangeLog@1.2048.1.1 +4 -0 + [Bug 3824] Spurious "ntpd: daemon failed to notify parent!" logged at event_sync. + + ntpd/ntp_proto.c@1.446 +3 -2 + CLarify error message + + ntpd/ntpd.c@1.189 +4 -2 + Fix logic error, clarify message + +ChangeSet@1.3997, 2023-06-02 19:29:12+00:00, davehart@tl.davehart.net + [Bug 3821] 4.2.8p16 misreads hex auth keys, won't interop with 4.2.8p15. + + ChangeLog@1.2049 +5 -0 + [Bug 3821] 4.2.8p16 misreads hex auth keys, won't interop with 4.2.8p15. + + libntp/authkeys.c@1.45 +2 -2 + > typo for >> + + tests/libntp/data/mills,david-03.jpg@1.1 +912 -0 + The internet's Father Time + + tests/libntp/data/mills,david-03.jpg@1.0 +0 -0 + + tests/libntp/data/ntp.keys@1.1 +34 -0 + Test keys for libntp/tests/digest.c + + tests/libntp/data/ntp.keys@1.0 +0 -0 + ChangeSet@1.3996, 2023-05-31 20:05:32-07:00, ntpreleng@ntp-build.tal1.ntfo.org NTP_4_2_8P16 TAG: NTP_4_2_8P16 @@ -1,4 +1,29 @@ --- +NTP 4.2.8p17 (Harlan Stenn <stenn@ntp.org>, 2023 Jun 06) + +Focus: Bug fixes + +Severity: HIGH (for people running 4.2.8p16) + +This release: + +- fixes 3 bugs, including a regression +- adds new unit tests + +Details below: + +* [Bug 3824] Spurious "ntpd: daemon failed to notify parent!" logged at + event_sync. Reported by Edward McGuire. <hart@ntp.org> +* [Bug 3822] ntpd significantly delays first poll of servers specified by name. + <hart@ntp.org> Miroslav Lichvar identified regression in 4.2.8p16. +* [Bug 3821] 4.2.8p16 misreads hex authentication keys, won't interop with + 4.2.8p15 or earlier. Reported by Matt Nordhoff, thanks to + Miroslav Lichvar and Matt for rapid testing and identifying the + problem. <hart@ntp.org> +* Add tests/libntp/digests.c to catch regressions reading keys file or with + symmetric authentication digest output. + +--- NTP 4.2.8p16 (Harlan Stenn <stenn@ntp.org>, 2023 May 30) Focus: Security, Bug fixes diff --git a/configure b/configure index a8c2ba593aa3..5d09904bea03 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for ntp 4.2.8p16. +# Generated by GNU Autoconf 2.71 for ntp 4.2.8p17. # # Report bugs to <https://bugs.ntp.org/>. # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ntp' PACKAGE_TARNAME='ntp' -PACKAGE_VERSION='4.2.8p16' -PACKAGE_STRING='ntp 4.2.8p16' +PACKAGE_VERSION='4.2.8p17' +PACKAGE_STRING='ntp 4.2.8p17' PACKAGE_BUGREPORT='https://bugs.ntp.org/' PACKAGE_URL='https://www.ntp.org/' @@ -1651,7 +1651,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ntp 4.2.8p16 to adapt to many kinds of systems. +\`configure' configures ntp 4.2.8p17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1722,7 +1722,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ntp 4.2.8p16:";; + short | recursive ) echo "Configuration of ntp 4.2.8p17:";; esac cat <<\_ACEOF @@ -1967,7 +1967,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ntp configure 4.2.8p16 +ntp configure 4.2.8p17 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2624,7 +2624,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ntp $as_me 4.2.8p16, which was +It was created by ntp $as_me 4.2.8p17, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4039,7 +4039,7 @@ fi # Define the identity of the package. PACKAGE='ntp' - VERSION='4.2.8p16' + VERSION='4.2.8p17' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -35365,7 +35365,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ntp $as_me 4.2.8p16, which was +This file was extended by ntp $as_me 4.2.8p17, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -35434,7 +35434,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ntp config.status 4.2.8p16 +ntp config.status 4.2.8p17 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/include/ntp.h b/include/ntp.h index c037f5986016..258ddd6138f7 100644 --- a/include/ntp.h +++ b/include/ntp.h @@ -134,7 +134,7 @@ typedef char s_char; * Miscellaneous stuff */ #define NTP_MAXKEY 65535 /* max authentication key number */ -#define KEY_TYPE_MD5 NID_md5 /* MD5 digest NID */ + /* * Limits of things */ diff --git a/include/ntp_md5.h b/include/ntp_md5.h index 06c90b2d2faf..8b5a7d0cbb49 100644 --- a/include/ntp_md5.h +++ b/include/ntp_md5.h @@ -6,6 +6,8 @@ #ifndef NTP_MD5_H #define NTP_MD5_H +# define KEY_TYPE_MD5 NID_md5 + #ifdef OPENSSL # include <openssl/evp.h> # include "libssl_compat.h" @@ -30,6 +32,8 @@ typedef MD5_CTX EVP_MD_CTX; +# define NID_md5 4 /* from openssl/objects.h */ +# define EVP_MAX_MD_SIZE 64 /* from openssl/evp.h */ # define EVP_MD_CTX_free(c) free(c) # define EVP_MD_CTX_new() calloc(1, sizeof(MD5_CTX)) # define EVP_get_digestbynid(t) NULL diff --git a/include/ntp_stdlib.h b/include/ntp_stdlib.h index 2d7c640565d5..446837e3adcb 100644 --- a/include/ntp_stdlib.h +++ b/include/ntp_stdlib.h @@ -11,6 +11,7 @@ #include "declcond.h" /* ntpd uses ntpd/declcond.h, others include/ */ #include "l_stdlib.h" +#include "ntp_md5.h" #include "ntp_net.h" #include "ntp_debug.h" #include "ntp_malloc.h" @@ -18,6 +19,10 @@ #include "ntp_syslog.h" #include "ntp_keyacc.h" +#ifndef PATH_MAX +# define PATH_MAX MAX_PATH +#endif + #ifdef __GNUC__ #define NTP_PRINTF(fmt, args) __attribute__((__format__(__printf__, fmt, args))) #else @@ -36,24 +41,16 @@ extern void mvsyslog(int, const char *, va_list) NTP_PRINTF(2, 0); extern void init_logging (const char *, u_int32, int); extern int change_logfile (const char *, int); extern void setup_logfile (const char *); -#ifndef errno_to_str +#ifndef errno_to_str /* Windows port defines this */ extern void errno_to_str(int, char *, size_t); #endif -extern char * ntp_realpath(const char * fsname); +extern char * ntp_realpath(const char *fsname); -extern int xvsbprintf(char**, char* const, char const*, va_list) NTP_PRINTF(3, 0); -extern int xsbprintf(char**, char* const, char const*, ...) NTP_PRINTF(3, 4); - -/* - * When building without OpenSSL, use a few macros of theirs to - * minimize source differences in NTP. - */ -#ifndef OPENSSL -#define NID_md5 4 /* from openssl/objects.h */ -/* from openssl/evp.h */ -#define EVP_MAX_MD_SIZE 64 /* longest known is SHA512 */ -#endif +extern int xvsbprintf(char **, char * const, char const *, va_list) + NTP_PRINTF(3, 0); +extern int xsbprintf(char **, char * const, char const *, ...) + NTP_PRINTF(3, 4); #define SAVE_ERRNO(stmt) \ { \ @@ -111,10 +108,16 @@ extern void auth_prealloc_symkeys(int); extern int ymd2yd (int, int, int); /* a_md5encrypt.c */ -extern int MD5authdecrypt (int, const u_char *, size_t, u_int32 *, size_t, size_t, keyid_t); -extern size_t MD5authencrypt (int, const u_char *, size_t, u_int32 *, size_t); -extern void MD5auth_setkey (keyid_t, int, const u_char *, size_t, KeyAccT *c); -extern u_int32 addr2refid (sockaddr_u *); +extern size_t MD5authencrypt (int type, const u_char *key, size_t klen, + u_int32 *pkt, size_t length); +extern int MD5authdecrypt (int type, const u_char *key, size_t klen, + u_int32 *pkt, size_t length, size_t size, + keyid_t keyno); +extern u_int32 addr2refid(sockaddr_u *); + +/* authkeys.c */ +extern void MD5auth_setkey (keyid_t, int, const u_char *, size_t, + KeyAccT *c); /* emalloc.c */ #ifndef EREALLOC_CALLSITE /* ntp_malloc.h defines */ diff --git a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c index 6011af52af6d..7a372969123f 100644 --- a/libntp/a_md5encrypt.c +++ b/libntp/a_md5encrypt.c @@ -9,7 +9,6 @@ #include "ntp_string.h" #include "ntp_stdlib.h" #include "ntp.h" -#include "ntp_md5.h" /* provides OpenSSL digest API */ #include "isc/string.h" typedef struct { @@ -22,10 +21,12 @@ typedef struct { size_t len; } rwbuffT; + #if defined(OPENSSL) && defined(ENABLE_CMAC) static size_t cmac_ctx_size( - CMAC_CTX * ctx) + CMAC_CTX * ctx + ) { size_t mlen = 0; @@ -36,14 +37,16 @@ cmac_ctx_size( } return mlen; } -#endif /*OPENSSL && ENABLE_CMAC*/ +#endif /* OPENSSL && ENABLE_CMAC */ + static size_t make_mac( const rwbuffT * digest, int ktype, const robuffT * key, - const robuffT * msg) + const robuffT * msg + ) { /* * Compute digest of key concatenated with packet. Note: the @@ -66,8 +69,8 @@ make_mac( /* adjust key size (zero padded buffer) if necessary */ if (AES_128_KEY_SIZE > key->len) { memcpy(keybuf, keyptr, key->len); - memset((keybuf + key->len), 0, - (AES_128_KEY_SIZE - key->len)); + zero_mem((keybuf + key->len), + (AES_128_KEY_SIZE - key->len)); keyptr = keybuf; } @@ -107,10 +110,10 @@ make_mac( goto mac_fail; } - #ifdef EVP_MD_CTX_FLAG_NON_FIPS_ALLOW + #ifdef EVP_MD_CTX_FLAG_NON_FIPS_ALLOW /* make sure MD5 is allowd */ EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW); - #endif + #endif /* [Bug 3457] DON'T use plain EVP_DigestInit! It would * kill the flags! */ if (!EVP_DigestInit_ex(ctx, EVP_get_digestbynid(ktype), NULL)) { @@ -239,8 +242,8 @@ MD5authdecrypt( dlen = MAX_MDG_LEN; if (size != (size_t)dlen + KEY_MAC_LEN) { msyslog(LOG_ERR, - "MAC decrypt: MAC length error: len=%zu key=%d", - size, keyno); + "MAC decrypt: MAC length error: len=%u key=%d", + (u_int)size, keyno); return (0); } return !isc_tsmemcmp(digest, diff --git a/libntp/authkeys.c b/libntp/authkeys.c index 4448dadd2b6a..d28b4b932b84 100644 --- a/libntp/authkeys.c +++ b/libntp/authkeys.c @@ -284,8 +284,7 @@ init_auth(void) */ newalloc = authhashbuckets * sizeof(key_hash[0]); - key_hash = erealloc(key_hash, newalloc); - memset(key_hash, '\0', newalloc); + key_hash = emalloc_zero(newalloc); INIT_DLIST(key_listhead, llink); @@ -458,7 +457,7 @@ auth_resize_hashtable(void) newalloc = authhashbuckets * sizeof(key_hash[0]); key_hash = erealloc(key_hash, newalloc); - memset(key_hash, '\0', newalloc); + zero_mem(key_hash, newalloc); ITER_DLIST_BEGIN(key_listhead, sk, llink, symkey) hash = KEYHASH(sk->keyid); @@ -528,14 +527,14 @@ freesymkey( bucket = &key_hash[KEYHASH(sk->keyid)]; if (sk->secret != NULL) { - memset(sk->secret, '\0', sk->secretsize); + zero_mem(sk->secret, sk->secretsize); free(sk->secret); } UNLINK_SLIST(unlinked, *bucket, sk, hlink, symkey); DEBUG_ENSURE(sk == unlinked); UNLINK_DLIST(sk, llink); - memset((char *)sk + offsetof(symkey, symkey_payload), '\0', - sizeof(*sk) - offsetof(symkey, symkey_payload)); + zero_mem((char *)sk + offsetof(symkey, symkey_payload), + sizeof(*sk) - offsetof(symkey, symkey_payload)); LINK_SLIST(authfreekeys, sk, llink.f); authnumkeys--; authnumfreekeys++; @@ -719,13 +718,13 @@ authistrusted( if (keyno == cache_keyid) { return (KEY_TRUSTED & cache_flags) && - keyacc_contains(cache_keyacclist, sau, TRUE); + keyacc_contains(cache_keyacclist, sau, TRUE); } if (NULL != (sk = auth_findkey(keyno))) { authkeyuncached++; return (KEY_TRUSTED & sk->flags) && - keyacc_contains(sk->keyacclist, sau, TRUE); + keyacc_contains(sk->keyacclist, sau, TRUE); } authkeynotfound++; @@ -800,7 +799,7 @@ MD5auth_setkey( allocsymkey(keyno, 0, (u_short)keytype, 0, secretsize, secret, ka); #ifdef DEBUG - if (debug >= 4) { + if (debug >= 1) { size_t j; printf("auth_setkey: key %d type %d len %d ", (int)keyno, @@ -816,7 +815,7 @@ MD5auth_setkey( /* * auth_delkeys - delete non-autokey untrusted keys, and clear all info - * except the trusted bit of non-autokey trusted keys, in + * except the trusted bit of non-autokey trusted keys, in * preparation for rereading the keys file. */ void @@ -835,7 +834,7 @@ auth_delkeys(void) */ if (KEY_TRUSTED & sk->flags) { if (sk->secret != NULL) { - memset(sk->secret, 0, sk->secretsize); + zero_mem(sk->secret, sk->secretsize); free(sk->secret); sk->secret = NULL; /* TALOS-CAN-0054 */ } @@ -886,9 +885,9 @@ authencrypt( * consists of a single word with value zero. */ authencryptions++; - pkt[length / 4] = htonl(keyno); + pkt[length / KEY_MAC_LEN] = htonl(keyno); if (0 == keyno) { - return 4; + return KEY_MAC_LEN; } if (!authhavekey(keyno)) { return 0; @@ -972,7 +971,7 @@ pwdecode_hex( reslen = (size_t)-1; break; } - tmp = (u_char)((ptr - hex) > 1); + tmp = (u_char)((ptr - hex) >> 1); if (j & 1) dst[j >> 1] |= tmp; else diff --git a/libntp/authreadkeys.c b/libntp/authreadkeys.c index da91bd0d3443..fa2f5b540de4 100644 --- a/libntp/authreadkeys.c +++ b/libntp/authreadkeys.c @@ -234,7 +234,7 @@ authreadkeys( * The key type is unused, but is required to be 'M' or * 'm' for compatibility. */ - if (!(*token == 'M' || *token == 'm')) { + if (! (toupper(*token) == 'M')) { log_maybe(NULL, "authreadkeys: invalid type for key %d", keyno); @@ -357,13 +357,21 @@ authreadkeys( continue; } - INSIST(NULL != next); + DEBUG_INSIST(NULL != next); +#if defined(OPENSSL) && defined(ENABLE_CMAC) + if (NID_cmac == keytype && len < 16) { + msyslog(LOG_WARNING, CMAC " keys are 128 bits, " + "zero-extending key %u by %u bits", + (u_int)keyno, 8 * (16 - (u_int)len)); + } +#endif /* OPENSSL && ENABLE_CMAC */ next->next = list; list = next; } fclose(fp); if (nerr > 0) { const char * why = ""; + if (nerr > nerr_maxlimit) why = " (emergency break)"; msyslog(LOG_ERR, diff --git a/libntp/msyslog.c b/libntp/msyslog.c index ae950171f468..a1ba72792595 100644 --- a/libntp/msyslog.c +++ b/libntp/msyslog.c @@ -583,8 +583,9 @@ setup_logfile( syslog_fname); } -/* Helper for unit tests, where stdout + stderr are piped to the same - * stream. This works moderately reliable only if both streams are +/* + * Helper for unit tests, where stdout + stderr are piped to the same + * stream. This works moderately reliably only if both streams are * unbuffered or line buffered. Unfortunately stdout can be fully * buffered on pipes or files... */ diff --git a/libparse/clk_hopf6021.c b/libparse/clk_hopf6021.c index c5980ef13f2b..b0b0c1ff2a73 100644 --- a/libparse/clk_hopf6021.c +++ b/libparse/clk_hopf6021.c @@ -25,7 +25,6 @@ #include "ntp_fp.h" #include "ntp_unixtime.h" #include "ntp_calendar.h" -#include "ascii.h" #include "parse.h" @@ -37,6 +36,8 @@ extern int printf (const char *, ...); #endif +#include "ascii.h" + /* * hopf Funkuhr 6021 * used with 9600,8N1, @@ -263,7 +264,7 @@ hexval( } #else /* not (REFCLOCK && CLOCK_PARSE && CLOCK_HOPF6021) */ -int clk_hopf6021_bs; +NONEMPTY_TRANSLATION_UNIT #endif /* not (REFCLOCK && CLOCK_PARSE && CLOCK_HOPF6021) */ /* diff --git a/libparse/clk_wharton.c b/libparse/clk_wharton.c index 371137dc6fe8..fbe9cc95f5f7 100644 --- a/libparse/clk_wharton.c +++ b/libparse/clk_wharton.c @@ -15,7 +15,6 @@ */ #include "ntp_fp.h" -#include "ascii.h" #include "parse.h" #ifndef PARSESTREAM @@ -26,6 +25,8 @@ extern void printf (const char *, ...); #endif +#include "ascii.h" + /* * In private e-mail alastair@wharton.co.uk said : * "If you are going to use the 400A and 404.2 system [for ntp] I recommend @@ -166,7 +167,7 @@ clockformat_t clock_wharton_400a = }; #else /* not (REFCLOCK && CLOCK_PARSE && CLOCK_WHARTON_400A) */ -int clk_wharton_400a_bs; +NONEMPTY_TRANSLATION_UNIT #endif /* not (REFCLOCK && CLOCK_PARSE && CLOCK_WHARTON_400A) */ /* diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index ff708155cd4e..86a039ea6f49 100644 --- a/ntpd/invoke-ntp.conf.texi +++ b/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed May 31, 2023 at 02:49:31 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:37:38 AM by AutoGen 5.18.16 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index 52dee572b434..3926518de3a2 100644 --- a/ntpd/invoke-ntp.keys.texi +++ b/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed May 31, 2023 at 02:49:34 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:37:41 AM by AutoGen 5.18.16 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index fbce35dd8d26..471bca5b86c8 100644 --- a/ntpd/invoke-ntpd.texi +++ b/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed May 31, 2023 at 02:49:36 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:37:42 AM by AutoGen 5.18.16 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -142,7 +142,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.8p16 +ntpd - NTP daemon program - Ver. 4.2.8p17 Usage: ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \ [ <server1> ... <serverN> ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 80b742f7d624..4e7a47ab83ef 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5man "31 May 2023" "4.2.8p16" "File Formats" +.TH ntp.conf 5man "06 Jun 2023" "4.2.8p17" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:38 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:45 AM by AutoGen 5.18.16 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index bc6f31c73c24..951f33da4faa 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:25 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:32 AM by AutoGen 5.18.16 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index bda4b750d4f5..f7f0b4bef931 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -50,7 +50,7 @@ Next: <a href="#ntp_002econf-Description" accesskey="n" rel="next">ntp.conf Desc <p>This document describes the configuration file for the NTP Project’s <code>ntpd</code> program. </p> -<p>This document applies to version 4.2.8p16 of <code>ntp.conf</code>. +<p>This document applies to version 4.2.8p17 of <code>ntp.conf</code>. </p> <span id="SEC_Overview"></span> <h2 class="shortcontents-heading">Short Table of Contents</h2> diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 10544a131eaa..0c56ee503df6 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5 "31 May 2023" "4.2.8p16" "File Formats" +.TH ntp.conf 5 "06 Jun 2023" "4.2.8p17" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:38 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:45 AM by AutoGen 5.18.16 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 338fb4b30977..22348ee727d0 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:25 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:32 AM by AutoGen 5.18.16 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 57086242537c..24dbfcf034a9 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "31 May 2023" "4.2.8p16" "File Formats" +.TH ntp.keys 5man "06 Jun 2023" "4.2.8p17" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:41 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:47 AM by AutoGen 5.18.16 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc index 3d8fe0d54070..100320fd2330 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTP_KEYS 5mdoc File Formats .Os FreeBSD 12.1-RELEASE_SI .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:28 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:34 AM by AutoGen 5.18.16 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html index 43e3c2565200..2d53d91f4d40 100644 --- a/ntpd/ntp.keys.html +++ b/ntpd/ntp.keys.html @@ -50,7 +50,7 @@ Next: <a href="#ntp_002ekeys-Description" accesskey="n" rel="next">ntp.keys Desc <p>This document describes the symmetric key file for the NTP Project’s <code>ntpd</code> program. </p> -<p>This document applies to version 4.2.8p16 of <code>ntp.keys</code>. +<p>This document applies to version 4.2.8p17 of <code>ntp.keys</code>. </p> <span id="SEC_Overview"></span> <h2 class="shortcontents-heading">Short Table of Contents</h2> diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 1655a4bacbcd..c646bb11e776 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "31 May 2023" "4.2.8p16" "File Formats" +.TH ntp.keys 5 "06 Jun 2023" "4.2.8p17" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:41 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:47 AM by AutoGen 5.18.16 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in index 0a85da0b020e..fdeaeba4c938 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTP_KEYS 5 File Formats .Os FreeBSD 12.1-RELEASE_SI .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:28 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:34 AM by AutoGen 5.18.16 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c index f7219b8ee560..d9a753ee3a1e 100644 --- a/ntpd/ntp_config.c +++ b/ntpd/ntp_config.c @@ -131,6 +131,7 @@ typedef struct peer_resolved_ctx_tag { u_char maxpoll; u_int32 ttl; const char * group; + int was_initializing; } peer_resolved_ctx; /* Limits */ @@ -4420,6 +4421,7 @@ config_peers( ctx->hmode = MODE_CLIENT; ctx->version = NTP_VERSION; ctx->flags = FLAG_IBURST; + ctx->was_initializing = initializing; ZERO(hints); hints.ai_family = (u_short)ctx->family; @@ -4500,6 +4502,7 @@ config_peers( ctx->ttl = curr_peer->ttl; ctx->keyid = curr_peer->peerkey; ctx->group = curr_peer->group; + ctx->was_initializing = initializing; ZERO(hints); hints.ai_family = ctx->family; @@ -4574,6 +4577,16 @@ peer_name_resolved( name, fam_spec, stoa(&peeraddr)); } + + /* + * peer_clear needs to know if this association was specified + * in the startup configuration file to set the next poll time. + */ + if (ctx->was_initializing) { + INSIST(!initializing); + initializing = TRUE; + } + peer_config( &peeraddr, NULL, @@ -4587,6 +4600,11 @@ peer_name_resolved( ctx->ttl, ctx->keyid, ctx->group); + + if (ctx->was_initializing) { + initializing = FALSE; + } + break; } } diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c index d1108c9d1456..0cc7fcb47ecd 100644 --- a/ntpd/ntp_control.c +++ b/ntpd/ntp_control.c @@ -26,7 +26,6 @@ #include "ntp_crypto.h" #include "ntp_assert.h" #include "ntp_leapsec.h" -#include "ntp_md5.h" /* provides OpenSSL digest API */ #include "lib_strbuf.h" #include "timexsup.h" diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c index 0499c363393d..e76e4dce0711 100644 --- a/ntpd/ntp_loopfilter.c +++ b/ntpd/ntp_loopfilter.c @@ -129,9 +129,6 @@ static int loop_started; /* TRUE after LOOP_DRIFTINIT */ static void rstclock (int, double); /* transition function */ static double direct_freq(double); /* direct set frequency */ static void set_freq(double); /* set frequency */ -#ifndef PATH_MAX -# define PATH_MAX MAX_PATH -#endif static char relative_path[PATH_MAX + 1]; /* relative path per recursive make */ static char *this_file = NULL; diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c index ea72dd3d37ae..f2c59238432a 100644 --- a/ntpd/ntp_proto.c +++ b/ntpd/ntp_proto.c @@ -2987,8 +2987,9 @@ clock_update( */ #ifdef HAVE_WORKING_FORK if (daemon_pipe[1] != -1) { - if (2 != write(daemon_pipe[1], "S\n", 2)) - msyslog(LOG_ERR, "ntpd: daemon failed to notify parent!"); + if (2 != write(daemon_pipe[1], "S\n", 2)) { + msyslog(LOG_ERR, "daemon failed to notify parent ntpd (--wait-sync)"); + } close(daemon_pipe[1]); daemon_pipe[1] = -1; DPRINTF(1, ("notified parent --wait-sync is done\n")); diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 646a304a8521..14774d684f2d 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed May 31, 2023 at 02:48:46 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:36:50 AM by AutoGen 5.18.16 * From the definitions ntpd-opts.def * and the template file options * @@ -80,7 +80,7 @@ extern FILE * option_usage_fp; * static const strings for ntpd options */ static char const ntpd_opt_strs[3133] = -/* 0 */ "ntpd 4.2.8p16\n" +/* 0 */ "ntpd 4.2.8p17\n" "Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -210,12 +210,12 @@ static char const ntpd_opt_strs[3133] = /* 2901 */ "output version information and exit\0" /* 2937 */ "version\0" /* 2945 */ "NTPD\0" -/* 2950 */ "ntpd - NTP daemon program - Ver. 4.2.8p16\n" +/* 2950 */ "ntpd - NTP daemon program - Ver. 4.2.8p17\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n" "\t\t[ <server1> ... <serverN> ]\n\0" /* 3082 */ "https://bugs.ntp.org, bugs@ntp.org\0" /* 3117 */ "\n\0" -/* 3119 */ "ntpd 4.2.8p16"; +/* 3119 */ "ntpd 4.2.8p17"; /** * ipv4 option description with @@ -1534,7 +1534,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.8p16\n\ + puts(_("ntpd 4.2.8p17\n\ Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1675,7 +1675,7 @@ implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.2.8p16\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.8p17\n\ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\ \t\t[ <server1> ... <serverN> ]\n")); @@ -1683,7 +1683,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.8p16")); + puts(_("ntpd 4.2.8p17")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index dc9ac899e8ee..3541255bb6fb 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed May 31, 2023 at 02:48:45 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:36:50 AM by AutoGen 5.18.16 * From the definitions ntpd-opts.def * and the template file options * @@ -114,9 +114,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 38 /** ntpd version */ -#define NTPD_VERSION "4.2.8p16" +#define NTPD_VERSION "4.2.8p17" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.8p16" +#define NTPD_FULL_VERSION "ntpd 4.2.8p17" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 1554bc89b840..237a9179f62e 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpd 1ntpdman "31 May 2023" "4.2.8p16" "User Commands" +.TH ntpd 1ntpdman "06 Jun 2023" "4.2.8p17" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:42 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:49 AM by AutoGen 5.18.16 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index f28af3193e0b..536e7f672840 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:29 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:36 AM by AutoGen 5.18.16 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c index f05924de7842..868f7a9c8068 100644 --- a/ntpd/ntpd.c +++ b/ntpd/ntpd.c @@ -1450,8 +1450,10 @@ int scmp_sc[] = { #if defined(SYS_WINNT) ntservice_isup(); #elif defined(HAVE_WORKING_FORK) - if ((daemon_pipe[1] != -1) && (2 != write(daemon_pipe[1], "R\n", 2))) { - msyslog(LOG_ERR, "ntpd: daemon failed to notify parent!"); + if (daemon_pipe[1] != -1) { + if (2 != write(daemon_pipe[1], "R\n", 2)) { + msyslog(LOG_ERR, "daemon failed to notify parent ntpd after init"); + } close(daemon_pipe[1]); daemon_pipe[1] = -1; } diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 9eff3bc81569..3947f57f1a9b 100644 --- a/ntpd/ntpd.html +++ b/ntpd/ntpd.html @@ -56,7 +56,7 @@ The program can operate in any of several modes, including client/server, symmetric and broadcast modes, and with both symmetric-key and public-key cryptography. </p> -<p>This document applies to version 4.2.8p16 of <code>ntpd</code>. +<p>This document applies to version 4.2.8p17 of <code>ntpd</code>. </p> <span id="SEC_Overview"></span> <h2 class="shortcontents-heading">Short Table of Contents</h2> @@ -292,7 +292,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">ntpd - NTP daemon program - Ver. 4.2.8p16 +<pre class="example">ntpd - NTP daemon program - Ver. 4.2.8p17 Usage: ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \ [ <server1> ... <serverN> ] Flg Arg Option-Name Description diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in index 02b7737fbfed..addee5d56e77 100644 --- a/ntpd/ntpd.man.in +++ b/ntpd/ntpd.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpd @NTPD_MS@ "31 May 2023" "4.2.8p16" "User Commands" +.TH ntpd @NTPD_MS@ "06 Jun 2023" "4.2.8p17" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:42 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:49 AM by AutoGen 5.18.16 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in index 2f97219ced96..6d99fbcf5e7a 100644 --- a/ntpd/ntpd.mdoc.in +++ b/ntpd/ntpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPD @NTPD_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:29 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:36 AM by AutoGen 5.18.16 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi index 62bc28ab1bf9..30b4a66d6a87 100644 --- a/ntpdc/invoke-ntpdc.texi +++ b/ntpdc/invoke-ntpdc.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpdc.texi) # -# It has been AutoGen-ed May 31, 2023 at 02:49:52 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:37:59 AM by AutoGen 5.18.16 # From the definitions ntpdc-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -77,7 +77,7 @@ with a status code of 0. @exampleindent 0 @example -ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p16 +ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p17 Usage: ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index f2fde352b5a6..536d1b970f98 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed May 31, 2023 at 02:49:46 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:37:53 AM by AutoGen 5.18.16 * From the definitions ntpdc-opts.def * and the template file options * @@ -74,7 +74,7 @@ extern FILE * option_usage_fp; * static const strings for ntpdc options */ static char const ntpdc_opt_strs[2005] = -/* 0 */ "ntpdc 4.2.8p16\n" +/* 0 */ "ntpdc 4.2.8p17\n" "Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -136,14 +136,14 @@ static char const ntpdc_opt_strs[2005] = /* 1785 */ "no-load-opts\0" /* 1798 */ "no\0" /* 1801 */ "NTPDC\0" -/* 1807 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p16\n" +/* 1807 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p17\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0" /* 1938 */ "$HOME\0" /* 1944 */ ".\0" /* 1946 */ ".ntprc\0" /* 1953 */ "https://bugs.ntp.org, bugs@ntp.org\0" /* 1988 */ "\n\0" -/* 1990 */ "ntpdc 4.2.8p16"; +/* 1990 */ "ntpdc 4.2.8p17"; /** * ipv4 option description with @@ -828,7 +828,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdcOptions.pzCopyright */ - puts(_("ntpdc 4.2.8p16\n\ + puts(_("ntpdc 4.2.8p17\n\ Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -897,14 +897,14 @@ implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntpdcOptions.pzUsageTitle */ - puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p16\n\ + puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p17\n\ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n")); /* referenced via ntpdcOptions.pzExplain */ puts(_("\n")); /* referenced via ntpdcOptions.pzFullVersion */ - puts(_("ntpdc 4.2.8p16")); + puts(_("ntpdc 4.2.8p17")); /* referenced via ntpdcOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 524b081703d4..47d3f481a54e 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed May 31, 2023 at 02:49:46 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:37:52 AM by AutoGen 5.18.16 * From the definitions ntpdc-opts.def * and the template file options * @@ -92,9 +92,9 @@ typedef enum { /** count of all options for ntpdc */ #define OPTION_CT 16 /** ntpdc version */ -#define NTPDC_VERSION "4.2.8p16" +#define NTPDC_VERSION "4.2.8p17" /** Full ntpdc version text */ -#define NTPDC_FULL_VERSION "ntpdc 4.2.8p16" +#define NTPDC_FULL_VERSION "ntpdc 4.2.8p17" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman index 446acb5fb53b..f101aadac589 100644 --- a/ntpdc/ntpdc.1ntpdcman +++ b/ntpdc/ntpdc.1ntpdcman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpdc 1ntpdcman "31 May 2023" "4.2.8p16" "User Commands" +.TH ntpdc 1ntpdcman "06 Jun 2023" "4.2.8p17" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:54 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:01 AM by AutoGen 5.18.16 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc index c750f834d99f..376443dae434 100644 --- a/ntpdc/ntpdc.1ntpdcmdoc +++ b/ntpdc/ntpdc.1ntpdcmdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPDC 1ntpdcmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:50 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:57 AM by AutoGen 5.18.16 .\" From the definitions ntpdc-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html index f036858d9c20..1a566baca91b 100644 --- a/ntpdc/ntpdc.html +++ b/ntpdc/ntpdc.html @@ -53,7 +53,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. </p> -<p>This document applies to version 4.2.8p16 of <code>ntpdc</code>. +<p>This document applies to version 4.2.8p17 of <code>ntpdc</code>. </p> <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -199,7 +199,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p16 +<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p17 Usage: ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in index cd518f7b1e8a..151c23b0c5c1 100644 --- a/ntpdc/ntpdc.man.in +++ b/ntpdc/ntpdc.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpdc @NTPDC_MS@ "31 May 2023" "4.2.8p16" "User Commands" +.TH ntpdc @NTPDC_MS@ "06 Jun 2023" "4.2.8p17" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:54 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:01 AM by AutoGen 5.18.16 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in index 87b5dba2bdf8..1a7859c448e6 100644 --- a/ntpdc/ntpdc.mdoc.in +++ b/ntpdc/ntpdc.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPDC @NTPDC_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:49:50 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:37:57 AM by AutoGen 5.18.16 .\" From the definitions ntpdc-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi index dd2a0038912b..715dbcba764e 100644 --- a/ntpq/invoke-ntpq.texi +++ b/ntpq/invoke-ntpq.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpq.texi) # -# It has been AutoGen-ed May 31, 2023 at 02:50:06 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:38:12 AM by AutoGen 5.18.16 # From the definitions ntpq-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -945,7 +945,7 @@ with a status code of 0. @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.8p16 +ntpq - standard NTP query program - Ver. 4.2.8p17 Usage: ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 name resolution diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index e6398fd724b4..3e176c057652 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * It has been AutoGen-ed May 31, 2023 at 02:49:56 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:38:03 AM by AutoGen 5.18.16 * From the definitions ntpq-opts.def * and the template file options * @@ -74,7 +74,7 @@ extern FILE * option_usage_fp; * static const strings for ntpq options */ static char const ntpq_opt_strs[2068] = -/* 0 */ "ntpq 4.2.8p16\n" +/* 0 */ "ntpq 4.2.8p17\n" "Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -140,13 +140,13 @@ static char const ntpq_opt_strs[2068] = /* 1858 */ "no-load-opts\0" /* 1871 */ "no\0" /* 1874 */ "NTPQ\0" -/* 1879 */ "ntpq - standard NTP query program - Ver. 4.2.8p16\n" +/* 1879 */ "ntpq - standard NTP query program - Ver. 4.2.8p17\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0" /* 1999 */ "$HOME\0" /* 2005 */ ".\0" /* 2007 */ ".ntprc\0" /* 2014 */ "https://bugs.ntp.org, bugs@ntp.org\0" -/* 2049 */ "ntpq 4.2.8p16\0" +/* 2049 */ "ntpq 4.2.8p17\0" /* 2063 */ "hash"; /** @@ -873,7 +873,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpqOptions.pzCopyright */ - puts(_("ntpq 4.2.8p16\n\ + puts(_("ntpq 4.2.8p17\n\ Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -945,11 +945,11 @@ implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntpqOptions.pzUsageTitle */ - puts(_("ntpq - standard NTP query program - Ver. 4.2.8p16\n\ + puts(_("ntpq - standard NTP query program - Ver. 4.2.8p17\n\ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n")); /* referenced via ntpqOptions.pzFullVersion */ - puts(_("ntpq 4.2.8p16")); + puts(_("ntpq 4.2.8p17")); /* referenced via ntpqOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 43637fd268cf..60d2ba1278c6 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed May 31, 2023 at 02:49:56 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:38:02 AM by AutoGen 5.18.16 * From the definitions ntpq-opts.def * and the template file options * @@ -93,9 +93,9 @@ typedef enum { /** count of all options for ntpq */ #define OPTION_CT 17 /** ntpq version */ -#define NTPQ_VERSION "4.2.8p16" +#define NTPQ_VERSION "4.2.8p17" /** Full ntpq version text */ -#define NTPQ_FULL_VERSION "ntpq 4.2.8p16" +#define NTPQ_FULL_VERSION "ntpq 4.2.8p17" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman index 79f7f4cbc06c..e4f93b336110 100644 --- a/ntpq/ntpq.1ntpqman +++ b/ntpq/ntpq.1ntpqman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpq 1ntpqman "31 May 2023" "4.2.8p16" "User Commands" +.TH ntpq 1ntpqman "06 Jun 2023" "4.2.8p17" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:50:08 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:15 AM by AutoGen 5.18.16 .\" From the definitions ntpq-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc index 9515506c71b5..9ce7db9484d3 100644 --- a/ntpq/ntpq.1ntpqmdoc +++ b/ntpq/ntpq.1ntpqmdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPQ 1ntpqmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:50:04 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:10 AM by AutoGen 5.18.16 .\" From the definitions ntpq-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html index 38a674378f89..1ca91e4f3cd4 100644 --- a/ntpq/ntpq.html +++ b/ntpq/ntpq.html @@ -62,7 +62,7 @@ monitor the operational status and determine the performance of <code>ntpd</code>, the NTP daemon. </p> -<p>This document applies to version 4.2.8p16 of <code>ntpq</code>. +<p>This document applies to version 4.2.8p17 of <code>ntpq</code>. </p> <table class="menu" border="0" cellspacing="0"> <tr><td align="left" valign="top">• <a href="#ntpq-Description" accesskey="1">ntpq Description</a></td><td> </td><td align="left" valign="top"> @@ -1274,7 +1274,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">ntpq - standard NTP query program - Ver. 4.2.8p16 +<pre class="example">ntpq - standard NTP query program - Ver. 4.2.8p17 Usage: ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 name resolution diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in index d5e8932d116c..12c085baf761 100644 --- a/ntpq/ntpq.man.in +++ b/ntpq/ntpq.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpq @NTPQ_MS@ "31 May 2023" "4.2.8p16" "User Commands" +.TH ntpq @NTPQ_MS@ "06 Jun 2023" "4.2.8p17" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:50:08 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:15 AM by AutoGen 5.18.16 .\" From the definitions ntpq-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in index 26070bd9a46d..d5ace4c4fd43 100644 --- a/ntpq/ntpq.mdoc.in +++ b/ntpq/ntpq.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPQ @NTPQ_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:50:04 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:10 AM by AutoGen 5.18.16 .\" From the definitions ntpq-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi index a01a9f2310d5..3f99a3f35f6f 100644 --- a/ntpsnmpd/invoke-ntpsnmpd.texi +++ b/ntpsnmpd/invoke-ntpsnmpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpsnmpd.texi) # -# It has been AutoGen-ed May 31, 2023 at 08:02:43 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:38:20 AM by AutoGen 5.18.16 # From the definitions ntpsnmpd-opts.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index c95e2bbf29f2..f13108da18d2 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed May 31, 2023 at 02:50:10 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:38:17 AM by AutoGen 5.18.16 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -66,7 +66,7 @@ extern FILE * option_usage_fp; * static const strings for ntpsnmpd options */ static char const ntpsnmpd_opt_strs[1614] = -/* 0 */ "ntpsnmpd 4.2.8p16\n" +/* 0 */ "ntpsnmpd 4.2.8p17\n" "Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -106,14 +106,14 @@ static char const ntpsnmpd_opt_strs[1614] = /* 1415 */ "no-load-opts\0" /* 1428 */ "no\0" /* 1431 */ "NTPSNMPD\0" -/* 1440 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p16\n" +/* 1440 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p17\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" /* 1544 */ "$HOME\0" /* 1550 */ ".\0" /* 1552 */ ".ntprc\0" /* 1559 */ "https://bugs.ntp.org, bugs@ntp.org\0" /* 1594 */ "\n\0" -/* 1596 */ "ntpsnmpd 4.2.8p16"; +/* 1596 */ "ntpsnmpd 4.2.8p17"; /** * nofork option description: @@ -559,7 +559,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpsnmpdOptions.pzCopyright */ - puts(_("ntpsnmpd 4.2.8p16\n\ + puts(_("ntpsnmpd 4.2.8p17\n\ Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -604,14 +604,14 @@ implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntpsnmpdOptions.pzUsageTitle */ - puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p16\n\ + puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p17\n\ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n")); /* referenced via ntpsnmpdOptions.pzExplain */ puts(_("\n")); /* referenced via ntpsnmpdOptions.pzFullVersion */ - puts(_("ntpsnmpd 4.2.8p16")); + puts(_("ntpsnmpd 4.2.8p17")); /* referenced via ntpsnmpdOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 360948a3be66..d5239d2e3050 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed May 31, 2023 at 02:50:10 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:38:16 AM by AutoGen 5.18.16 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -84,9 +84,9 @@ typedef enum { /** count of all options for ntpsnmpd */ #define OPTION_CT 8 /** ntpsnmpd version */ -#define NTPSNMPD_VERSION "4.2.8p16" +#define NTPSNMPD_VERSION "4.2.8p17" /** Full ntpsnmpd version text */ -#define NTPSNMPD_FULL_VERSION "ntpsnmpd 4.2.8p16" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd 4.2.8p17" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman index 47d048b7967e..29f12c6c913d 100644 --- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman +++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpsnmpd 1ntpsnmpdman "31 May 2023" "4.2.8p16" "User Commands" +.TH ntpsnmpd 1ntpsnmpdman "06 Jun 2023" "4.2.8p17" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:16:36 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:21 AM by AutoGen 5.18.16 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc index 33df8211c178..be353c7468ce 100644 --- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc +++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:50:11 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:18 AM by AutoGen 5.18.16 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpsnmpd/ntpsnmpd.html b/ntpsnmpd/ntpsnmpd.html index 141d1e249e81..e31de98c7b90 100644 --- a/ntpsnmpd/ntpsnmpd.html +++ b/ntpsnmpd/ntpsnmpd.html @@ -60,7 +60,7 @@ Next: <a href="#ntpsnmpd-Description" accesskey="n" rel="next">ntpsnmpd Descript <p>The <code>ntpsnmpd</code> utility program is used to monitor NTP daemon <code>ntpd</code> operations and determine performance. It uses the standard NTP mode 6 control </p> -<p>This document applies to version 4.2.8p16 of <code>ntpsnmpd</code>. +<p>This document applies to version 4.2.8p17 of <code>ntpsnmpd</code>. </p> <table class="menu" border="0" cellspacing="0"> <tr><td align="left" valign="top">• <a href="#ntpsnmpd-Description" accesskey="1">ntpsnmpd Description</a></td><td> </td><td align="left" valign="top">Description diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in index 06bfdbb3dd48..7080d07b3310 100644 --- a/ntpsnmpd/ntpsnmpd.man.in +++ b/ntpsnmpd/ntpsnmpd.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpsnmpd @NTPSNMPD_MS@ "31 May 2023" "4.2.8p16" "User Commands" +.TH ntpsnmpd @NTPSNMPD_MS@ "06 Jun 2023" "4.2.8p17" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:16:36 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:21 AM by AutoGen 5.18.16 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in index 242092f566e7..b0f89d34b309 100644 --- a/ntpsnmpd/ntpsnmpd.mdoc.in +++ b/ntpsnmpd/ntpsnmpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:50:11 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:18 AM by AutoGen 5.18.16 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/packageinfo.sh b/packageinfo.sh index c07441837e24..0ee08b67086d 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -83,7 +83,7 @@ CLTAG=NTP_4_2_0 # - Numeric values increment # - empty 'increments' to 1 # - NEW 'increments' to empty -point=16 +point=17 ### betapoint is normally modified by script. # ntp-stable Beta number (betapoint) diff --git a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman index fed967e5137d..e1d2216c31d8 100644 --- a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman +++ b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH calc_tickadj 1calc_tickadjman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH calc_tickadj 1calc_tickadjman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:21 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:10 AM by AutoGen 5.18.16 .\" From the definitions calc_tickadj-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc index ce5185e0daf3..71507c329099 100644 --- a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc +++ b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (calc_tickadj-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:14:57 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:12 AM by AutoGen 5.18.16 .\" From the definitions calc_tickadj-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/calc_tickadj/calc_tickadj.html b/scripts/calc_tickadj/calc_tickadj.html index 15fb970e08b1..fb583099b5d8 100644 --- a/scripts/calc_tickadj/calc_tickadj.html +++ b/scripts/calc_tickadj/calc_tickadj.html @@ -47,7 +47,7 @@ Previous: <a href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a href <span id="calc_005ftickadj-User_0027s-Manual"></span><h1 class="top">calc_tickadj User’s Manual</h1> <p>This document describes the use of the NTP Project’s <code>calc_tickadj</code> program. -This document applies to version 4.2.8p16 of <code>calc_tickadj</code>. +This document applies to version 4.2.8p17 of <code>calc_tickadj</code>. </p> <span id="SEC_Overview"></span> <h2 class="shortcontents-heading">Short Table of Contents</h2> diff --git a/scripts/calc_tickadj/calc_tickadj.man.in b/scripts/calc_tickadj/calc_tickadj.man.in index fed967e5137d..e1d2216c31d8 100644 --- a/scripts/calc_tickadj/calc_tickadj.man.in +++ b/scripts/calc_tickadj/calc_tickadj.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH calc_tickadj 1calc_tickadjman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH calc_tickadj 1calc_tickadjman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:21 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:10 AM by AutoGen 5.18.16 .\" From the definitions calc_tickadj-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/calc_tickadj/calc_tickadj.mdoc.in b/scripts/calc_tickadj/calc_tickadj.mdoc.in index ce5185e0daf3..71507c329099 100644 --- a/scripts/calc_tickadj/calc_tickadj.mdoc.in +++ b/scripts/calc_tickadj/calc_tickadj.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (calc_tickadj-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:14:57 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:12 AM by AutoGen 5.18.16 .\" From the definitions calc_tickadj-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/calc_tickadj/invoke-calc_tickadj.texi b/scripts/calc_tickadj/invoke-calc_tickadj.texi index 5b64a0512487..6d0ce24f0096 100644 --- a/scripts/calc_tickadj/invoke-calc_tickadj.texi +++ b/scripts/calc_tickadj/invoke-calc_tickadj.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-calc_tickadj.texi) # -# It has been AutoGen-ed May 31, 2023 at 08:04:23 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:13 AM by AutoGen 5.18.16 # From the definitions calc_tickadj-opts.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/scripts/invoke-plot_summary.texi b/scripts/invoke-plot_summary.texi index 30b54985877d..65faebaa7d97 100644 --- a/scripts/invoke-plot_summary.texi +++ b/scripts/invoke-plot_summary.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-plot_summary.texi) # -# It has been AutoGen-ed May 31, 2023 at 08:04:36 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:36 AM by AutoGen 5.18.16 # From the definitions plot_summary-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -41,7 +41,7 @@ with a status code of 0. @exampleindent 0 @example -plot_summary - plot statistics generated by summary script - Ver. 4.2.8p16 +plot_summary - plot statistics generated by summary script - Ver. 4.2.8p17 USAGE: plot_summary [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... --directory=str Where the summary files are diff --git a/scripts/invoke-summary.texi b/scripts/invoke-summary.texi index 7994844cfe5d..1b82c93397b7 100644 --- a/scripts/invoke-summary.texi +++ b/scripts/invoke-summary.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-summary.texi) # -# It has been AutoGen-ed May 31, 2023 at 08:04:40 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:40 AM by AutoGen 5.18.16 # From the definitions summary-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -42,7 +42,7 @@ with a status code of 0. @exampleindent 0 @example -summary - compute various stastics from NTP stat files - Ver. 4.2.8p16 +summary - compute various stastics from NTP stat files - Ver. 4.2.8p17 USAGE: summary [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... --directory=str Directory containing stat files diff --git a/scripts/ntp-wait/invoke-ntp-wait.texi b/scripts/ntp-wait/invoke-ntp-wait.texi index cfeef3275b84..138a43d9b2fc 100644 --- a/scripts/ntp-wait/invoke-ntp-wait.texi +++ b/scripts/ntp-wait/invoke-ntp-wait.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp-wait.texi) # -# It has been AutoGen-ed May 31, 2023 at 07:15:00 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:17 AM by AutoGen 5.18.16 # From the definitions ntp-wait-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -61,7 +61,7 @@ with a status code of 0. @exampleindent 0 @example -ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p16 +ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p17 USAGE: ntp-wait [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... -n, --tries=num Number of times to check ntpd diff --git a/scripts/ntp-wait/ntp-wait-opts b/scripts/ntp-wait/ntp-wait-opts index 45418bd38d99..944d4c1404ab 100644 --- a/scripts/ntp-wait/ntp-wait-opts +++ b/scripts/ntp-wait/ntp-wait-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (ntp-wait-opts) # -# It has been AutoGen-ed May 31, 2023 at 07:14:58 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:15 AM by AutoGen 5.18.16 # From the definitions ntp-wait-opts.def # and the template file perlopt @@ -40,7 +40,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p16 +ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p17 USAGE: ntp-wait [ -<flag> [<val>] | --<name>[{=| }<val>] ]... -n, --tries=num Number of times to check ntpd diff --git a/scripts/ntp-wait/ntp-wait.1ntp-waitman b/scripts/ntp-wait/ntp-wait.1ntp-waitman index a8b161e8df6b..1a01d97b5729 100644 --- a/scripts/ntp-wait/ntp-wait.1ntp-waitman +++ b/scripts/ntp-wait/ntp-wait.1ntp-waitman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp-wait 1ntp-waitman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH ntp-wait 1ntp-waitman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:25 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:18 AM by AutoGen 5.18.16 .\" From the definitions ntp-wait-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc index 6953f46384d5..cb5ad0252df6 100644 --- a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc +++ b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTP_WAIT 1ntp-waitmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntp-wait-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:14:59 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:15 AM by AutoGen 5.18.16 .\" From the definitions ntp-wait-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/ntp-wait/ntp-wait.html b/scripts/ntp-wait/ntp-wait.html index d5e16aff4474..282f5db6e517 100644 --- a/scripts/ntp-wait/ntp-wait.html +++ b/scripts/ntp-wait/ntp-wait.html @@ -58,7 +58,7 @@ until the system’s time has stabilized and synchronized, and only then start any applicaitons (like database servers) that require accurate and stable time. </p> -<p>This document applies to version 4.2.8p16 of <code>ntp-wait</code>. +<p>This document applies to version 4.2.8p17 of <code>ntp-wait</code>. </p> <span id="SEC_Overview"></span> <h2 class="shortcontents-heading">Short Table of Contents</h2> @@ -145,7 +145,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p16 +<pre class="example">ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p17 USAGE: ntp-wait [ -<flag> [<val>] | --<name>[{=| }<val>] ]... -n, --tries=num Number of times to check ntpd diff --git a/scripts/ntp-wait/ntp-wait.man.in b/scripts/ntp-wait/ntp-wait.man.in index 49b543ada260..4e9b184b847f 100644 --- a/scripts/ntp-wait/ntp-wait.man.in +++ b/scripts/ntp-wait/ntp-wait.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp-wait @NTP_WAIT_MS@ "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH ntp-wait @NTP_WAIT_MS@ "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:25 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:18 AM by AutoGen 5.18.16 .\" From the definitions ntp-wait-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/ntp-wait/ntp-wait.mdoc.in b/scripts/ntp-wait/ntp-wait.mdoc.in index 9403f4c78750..35e7a2ab06fd 100644 --- a/scripts/ntp-wait/ntp-wait.mdoc.in +++ b/scripts/ntp-wait/ntp-wait.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntp-wait-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:14:59 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:15 AM by AutoGen 5.18.16 .\" From the definitions ntp-wait-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/ntpsweep/invoke-ntpsweep.texi b/scripts/ntpsweep/invoke-ntpsweep.texi index 732930c99c63..d81aa76d21d2 100644 --- a/scripts/ntpsweep/invoke-ntpsweep.texi +++ b/scripts/ntpsweep/invoke-ntpsweep.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpsweep.texi) # -# It has been AutoGen-ed May 31, 2023 at 08:04:26 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:20 AM by AutoGen 5.18.16 # From the definitions ntpsweep-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -45,7 +45,7 @@ with a status code of 0. @exampleindent 0 @example -ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p16 +ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p17 USAGE: ntpsweep [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [hostfile] -l, --host-list=str Host to execute actions on diff --git a/scripts/ntpsweep/ntpsweep-opts b/scripts/ntpsweep/ntpsweep-opts index de933c8845c8..61bfb34159f0 100644 --- a/scripts/ntpsweep/ntpsweep-opts +++ b/scripts/ntpsweep/ntpsweep-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (ntpsweep-opts) # -# It has been AutoGen-ed May 31, 2023 at 07:15:02 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:20 AM by AutoGen 5.18.16 # From the definitions ntpsweep-opts.def # and the template file perlopt @@ -43,7 +43,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p16 +ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p17 USAGE: ntpsweep [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostfile] -l, --host-list=str Host to execute actions on diff --git a/scripts/ntpsweep/ntpsweep.1ntpsweepman b/scripts/ntpsweep/ntpsweep.1ntpsweepman index c1ff4d749f9f..e609f54128ee 100644 --- a/scripts/ntpsweep/ntpsweep.1ntpsweepman +++ b/scripts/ntpsweep/ntpsweep.1ntpsweepman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpsweep 1ntpsweepman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH ntpsweep 1ntpsweepman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:29 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:23 AM by AutoGen 5.18.16 .\" From the definitions ntpsweep-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc b/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc index 8e1376da62ae..37b9e81f20f7 100644 --- a/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc +++ b/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPSWEEP 1ntpsweepmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpsweep-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:28 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:22 AM by AutoGen 5.18.16 .\" From the definitions ntpsweep-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/ntpsweep/ntpsweep.html b/scripts/ntpsweep/ntpsweep.html index 8615b6bd08e5..bca4b02986cf 100644 --- a/scripts/ntpsweep/ntpsweep.html +++ b/scripts/ntpsweep/ntpsweep.html @@ -49,7 +49,7 @@ Previous: <a href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a href <p>This document describes the use of the NTP Project’s <code>ntpsweep</code> program. </p> -<p>This document applies to version 4.2.8p16 of <code>ntpsweep</code>. +<p>This document applies to version 4.2.8p17 of <code>ntpsweep</code>. </p> <span id="SEC_Overview"></span> <h2 class="shortcontents-heading">Short Table of Contents</h2> @@ -120,7 +120,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p16 +<pre class="example">ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p17 USAGE: ntpsweep [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostfile] -l, --host-list=str Host to execute actions on diff --git a/scripts/ntpsweep/ntpsweep.man.in b/scripts/ntpsweep/ntpsweep.man.in index c1ff4d749f9f..e609f54128ee 100644 --- a/scripts/ntpsweep/ntpsweep.man.in +++ b/scripts/ntpsweep/ntpsweep.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpsweep 1ntpsweepman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH ntpsweep 1ntpsweepman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:29 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:23 AM by AutoGen 5.18.16 .\" From the definitions ntpsweep-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/ntpsweep/ntpsweep.mdoc.in b/scripts/ntpsweep/ntpsweep.mdoc.in index 8e1376da62ae..37b9e81f20f7 100644 --- a/scripts/ntpsweep/ntpsweep.mdoc.in +++ b/scripts/ntpsweep/ntpsweep.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPSWEEP 1ntpsweepmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpsweep-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:28 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:22 AM by AutoGen 5.18.16 .\" From the definitions ntpsweep-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/ntptrace/invoke-ntptrace.texi b/scripts/ntptrace/invoke-ntptrace.texi index 0beb1d3f2223..0169c0eb6a97 100644 --- a/scripts/ntptrace/invoke-ntptrace.texi +++ b/scripts/ntptrace/invoke-ntptrace.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntptrace.texi) # -# It has been AutoGen-ed May 31, 2023 at 07:15:04 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:27 AM by AutoGen 5.18.16 # From the definitions ntptrace-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -62,7 +62,7 @@ with a status code of 0. @exampleindent 0 @example -ntptrace - Trace peers of an NTP server - Ver. 4.2.8p16 +ntptrace - Trace peers of an NTP server - Ver. 4.2.8p17 USAGE: ntptrace [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [host] -n, --numeric Print IP addresses instead of hostnames diff --git a/scripts/ntptrace/ntptrace-opts b/scripts/ntptrace/ntptrace-opts index 19b166d50013..ea17cb0f66c9 100644 --- a/scripts/ntptrace/ntptrace-opts +++ b/scripts/ntptrace/ntptrace-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (ntptrace-opts) # -# It has been AutoGen-ed May 31, 2023 at 07:15:03 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:25 AM by AutoGen 5.18.16 # From the definitions ntptrace-opts.def # and the template file perlopt @@ -40,7 +40,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -ntptrace - Trace peers of an NTP server - Ver. 4.2.8p16 +ntptrace - Trace peers of an NTP server - Ver. 4.2.8p17 USAGE: ntptrace [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [host] -n, --numeric Print IP addresses instead of hostnames diff --git a/scripts/ntptrace/ntptrace.1ntptraceman b/scripts/ntptrace/ntptrace.1ntptraceman index 12ea969f1c85..c1833697961a 100644 --- a/scripts/ntptrace/ntptrace.1ntptraceman +++ b/scripts/ntptrace/ntptrace.1ntptraceman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntptrace 1ntptraceman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH ntptrace 1ntptraceman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:31 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:28 AM by AutoGen 5.18.16 .\" From the definitions ntptrace-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/ntptrace/ntptrace.1ntptracemdoc b/scripts/ntptrace/ntptrace.1ntptracemdoc index 90443c861517..d42f63a644fc 100644 --- a/scripts/ntptrace/ntptrace.1ntptracemdoc +++ b/scripts/ntptrace/ntptrace.1ntptracemdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPTRACE 1ntptracemdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntptrace-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:15:03 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:25 AM by AutoGen 5.18.16 .\" From the definitions ntptrace-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/ntptrace/ntptrace.html b/scripts/ntptrace/ntptrace.html index a837ae498723..594c9ef59cd7 100644 --- a/scripts/ntptrace/ntptrace.html +++ b/scripts/ntptrace/ntptrace.html @@ -48,7 +48,7 @@ Previous: <a href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a href <span id="Simple-Network-Time-Protocol-User-Manual"></span><h1 class="top">Simple Network Time Protocol User Manual</h1> <p>This document describes the use of the NTP Project’s <code>ntptrace</code> program. -This document applies to version 4.2.8p16 of <code>ntptrace</code>. +This document applies to version 4.2.8p17 of <code>ntptrace</code>. </p> <span id="SEC_Overview"></span> <h2 class="shortcontents-heading">Short Table of Contents</h2> @@ -135,7 +135,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">ntptrace - Trace peers of an NTP server - Ver. 4.2.8p16 +<pre class="example">ntptrace - Trace peers of an NTP server - Ver. 4.2.8p17 USAGE: ntptrace [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [host] -n, --numeric Print IP addresses instead of hostnames diff --git a/scripts/ntptrace/ntptrace.man.in b/scripts/ntptrace/ntptrace.man.in index a87d865a4b72..db4e5ab6c3aa 100644 --- a/scripts/ntptrace/ntptrace.man.in +++ b/scripts/ntptrace/ntptrace.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntptrace @NTPTRACE_MS@ "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH ntptrace @NTPTRACE_MS@ "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:31 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:28 AM by AutoGen 5.18.16 .\" From the definitions ntptrace-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/ntptrace/ntptrace.mdoc.in b/scripts/ntptrace/ntptrace.mdoc.in index 125b951187c2..1d64345f1689 100644 --- a/scripts/ntptrace/ntptrace.mdoc.in +++ b/scripts/ntptrace/ntptrace.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTPTRACE @NTPTRACE_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntptrace-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:15:03 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:25 AM by AutoGen 5.18.16 .\" From the definitions ntptrace-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/plot_summary-opts b/scripts/plot_summary-opts index e451204d66b9..10e2fdfaec7f 100644 --- a/scripts/plot_summary-opts +++ b/scripts/plot_summary-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (plot_summary-opts) # -# It has been AutoGen-ed May 31, 2023 at 07:15:08 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:35 AM by AutoGen 5.18.16 # From the definitions plot_summary-opts.def # and the template file perlopt @@ -46,7 +46,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -plot_summary - plot statistics generated by summary script - Ver. 4.2.8p16 +plot_summary - plot statistics generated by summary script - Ver. 4.2.8p17 USAGE: plot_summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]... --directory=str Where the summary files are diff --git a/scripts/plot_summary.1plot_summaryman b/scripts/plot_summary.1plot_summaryman index 26a2f8dfc523..14bc3202139b 100644 --- a/scripts/plot_summary.1plot_summaryman +++ b/scripts/plot_summary.1plot_summaryman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH plot_summary 1plot_summaryman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH plot_summary 1plot_summaryman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:37 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:37 AM by AutoGen 5.18.16 .\" From the definitions plot_summary-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/plot_summary.1plot_summarymdoc b/scripts/plot_summary.1plot_summarymdoc index 1fb81452eb34..338e8e5debac 100644 --- a/scripts/plot_summary.1plot_summarymdoc +++ b/scripts/plot_summary.1plot_summarymdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (plot_summary-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:39 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:38 AM by AutoGen 5.18.16 .\" From the definitions plot_summary-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/plot_summary.html b/scripts/plot_summary.html index c6ac597463a9..fc944c708e11 100644 --- a/scripts/plot_summary.html +++ b/scripts/plot_summary.html @@ -48,7 +48,7 @@ Previous: <a href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a href <span id="Plot_005fsummary-User-Manual"></span><h1 class="top">Plot_summary User Manual</h1> <p>This document describes the use of the NTP Project’s <code>plot_summary</code> program. -This document applies to version 4.2.8p16 of <code>plot_summary</code>. +This document applies to version 4.2.8p17 of <code>plot_summary</code>. </p> <span id="SEC_Overview"></span> <h2 class="shortcontents-heading">Short Table of Contents</h2> @@ -116,7 +116,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">plot_summary - plot statistics generated by summary script - Ver. 4.2.8p16 +<pre class="example">plot_summary - plot statistics generated by summary script - Ver. 4.2.8p17 USAGE: plot_summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]... --directory=str Where the summary files are diff --git a/scripts/plot_summary.man.in b/scripts/plot_summary.man.in index 26a2f8dfc523..14bc3202139b 100644 --- a/scripts/plot_summary.man.in +++ b/scripts/plot_summary.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH plot_summary 1plot_summaryman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH plot_summary 1plot_summaryman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:37 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:37 AM by AutoGen 5.18.16 .\" From the definitions plot_summary-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/plot_summary.mdoc.in b/scripts/plot_summary.mdoc.in index 1fb81452eb34..338e8e5debac 100644 --- a/scripts/plot_summary.mdoc.in +++ b/scripts/plot_summary.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (plot_summary-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:39 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:38 AM by AutoGen 5.18.16 .\" From the definitions plot_summary-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/summary-opts b/scripts/summary-opts index f5d962227e6d..4cb1515193d6 100644 --- a/scripts/summary-opts +++ b/scripts/summary-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (summary-opts) # -# It has been AutoGen-ed May 31, 2023 at 07:15:08 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:35 AM by AutoGen 5.18.16 # From the definitions summary-opts.def # and the template file perlopt @@ -44,7 +44,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -summary - compute various stastics from NTP stat files - Ver. 4.2.8p16 +summary - compute various stastics from NTP stat files - Ver. 4.2.8p17 USAGE: summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]... --directory=str Directory containing stat files diff --git a/scripts/summary.1summaryman b/scripts/summary.1summaryman index bc68596f2e45..282e7640fa3b 100644 --- a/scripts/summary.1summaryman +++ b/scripts/summary.1summaryman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH summary 1summaryman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH summary 1summaryman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:42 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:41 AM by AutoGen 5.18.16 .\" From the definitions summary-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/summary.1summarymdoc b/scripts/summary.1summarymdoc index 9817ab6dc8f0..0c83fddc9219 100644 --- a/scripts/summary.1summarymdoc +++ b/scripts/summary.1summarymdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt SUMMARY 1summarymdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (summary-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:43 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:43 AM by AutoGen 5.18.16 .\" From the definitions summary-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/summary.html b/scripts/summary.html index 6d77556cdb1d..6ce82201c38e 100644 --- a/scripts/summary.html +++ b/scripts/summary.html @@ -48,7 +48,7 @@ Previous: <a href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a href <span id="Summary-User-Manual"></span><h1 class="top">Summary User Manual</h1> <p>This document describes the use of the NTP Project’s <code>summary</code> program. -This document applies to version 4.2.8p16 of <code>summary</code>. +This document applies to version 4.2.8p17 of <code>summary</code>. </p> <span id="SEC_Overview"></span> <h2 class="shortcontents-heading">Short Table of Contents</h2> @@ -116,7 +116,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">summary - compute various stastics from NTP stat files - Ver. 4.2.8p16 +<pre class="example">summary - compute various stastics from NTP stat files - Ver. 4.2.8p17 USAGE: summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]... --directory=str Directory containing stat files diff --git a/scripts/summary.man.in b/scripts/summary.man.in index bc68596f2e45..282e7640fa3b 100644 --- a/scripts/summary.man.in +++ b/scripts/summary.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH summary 1summaryman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH summary 1summaryman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:42 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:41 AM by AutoGen 5.18.16 .\" From the definitions summary-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/summary.mdoc.in b/scripts/summary.mdoc.in index 9817ab6dc8f0..0c83fddc9219 100644 --- a/scripts/summary.mdoc.in +++ b/scripts/summary.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt SUMMARY 1summarymdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (summary-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:43 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:43 AM by AutoGen 5.18.16 .\" From the definitions summary-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/update-leap/invoke-update-leap.texi b/scripts/update-leap/invoke-update-leap.texi index d4d92d951da3..bc80b5a40936 100644 --- a/scripts/update-leap/invoke-update-leap.texi +++ b/scripts/update-leap/invoke-update-leap.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-update-leap.texi) # -# It has been AutoGen-ed May 31, 2023 at 08:04:32 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:31 AM by AutoGen 5.18.16 # From the definitions update-leap-opts.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/scripts/update-leap/update-leap-opts b/scripts/update-leap/update-leap-opts index a29dd1155c48..2aab11deb6a1 100644 --- a/scripts/update-leap/update-leap-opts +++ b/scripts/update-leap/update-leap-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (update-leap-opts) # -# It has been AutoGen-ed May 31, 2023 at 08:04:36 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:39:35 AM by AutoGen 5.18.16 # From the definitions update-leap-opts.def # and the template file perlopt @@ -46,7 +46,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -update-leap - leap-seconds file manager/updater - Ver. 4.2.8p16 +update-leap - leap-seconds file manager/updater - Ver. 4.2.8p17 USAGE: update-leap [ -<flag> [<val>] | --<name>[{=| }<val>] ]... -s, --source-url=str The URL of the master copy of the leapseconds file diff --git a/scripts/update-leap/update-leap.1update-leapman b/scripts/update-leap/update-leap.1update-leapman index 7feccfafcbe8..83871441e444 100644 --- a/scripts/update-leap/update-leap.1update-leapman +++ b/scripts/update-leap/update-leap.1update-leapman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH update-leap 1update-leapman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH update-leap 1update-leapman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:34 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:33 AM by AutoGen 5.18.16 .\" From the definitions update-leap-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/update-leap/update-leap.1update-leapmdoc b/scripts/update-leap/update-leap.1update-leapmdoc index ba971fe17a0a..449a0840a946 100644 --- a/scripts/update-leap/update-leap.1update-leapmdoc +++ b/scripts/update-leap/update-leap.1update-leapmdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt UPDATE_LEAP 1update-leapmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (update-leap-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:15:06 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:30 AM by AutoGen 5.18.16 .\" From the definitions update-leap-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/update-leap/update-leap.html b/scripts/update-leap/update-leap.html index 8ebc3294a313..afdc9977d604 100644 --- a/scripts/update-leap/update-leap.html +++ b/scripts/update-leap/update-leap.html @@ -49,7 +49,7 @@ Previous: <a href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a href <p>This document describes the use of the NTP Project’s <code>update-leap</code> program. </p> -<p>This document applies to version 4.2.8p16 of <code>update-leap</code>. +<p>This document applies to version 4.2.8p17 of <code>update-leap</code>. </p> <span id="SEC_Overview"></span> <h2 class="shortcontents-heading">Short Table of Contents</h2> diff --git a/scripts/update-leap/update-leap.man.in b/scripts/update-leap/update-leap.man.in index 7feccfafcbe8..83871441e444 100644 --- a/scripts/update-leap/update-leap.man.in +++ b/scripts/update-leap/update-leap.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH update-leap 1update-leapman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH update-leap 1update-leapman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 08:04:34 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:33 AM by AutoGen 5.18.16 .\" From the definitions update-leap-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/update-leap/update-leap.mdoc.in b/scripts/update-leap/update-leap.mdoc.in index ba971fe17a0a..449a0840a946 100644 --- a/scripts/update-leap/update-leap.mdoc.in +++ b/scripts/update-leap/update-leap.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt UPDATE_LEAP 1update-leapmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (update-leap-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:15:06 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:39:30 AM by AutoGen 5.18.16 .\" From the definitions update-leap-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/sntp/configure b/sntp/configure index e531e554001e..b435871daf0e 100755 --- a/sntp/configure +++ b/sntp/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sntp 4.2.8p16. +# Generated by GNU Autoconf 2.71 for sntp 4.2.8p17. # # Report bugs to <https://bugs.ntp.org/>. # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sntp' PACKAGE_TARNAME='sntp' -PACKAGE_VERSION='4.2.8p16' -PACKAGE_STRING='sntp 4.2.8p16' +PACKAGE_VERSION='4.2.8p17' +PACKAGE_STRING='sntp 4.2.8p17' PACKAGE_BUGREPORT='https://bugs.ntp.org/' PACKAGE_URL='https://www.ntp.org/' @@ -1526,7 +1526,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sntp 4.2.8p16 to adapt to many kinds of systems. +\`configure' configures sntp 4.2.8p17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1597,7 +1597,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sntp 4.2.8p16:";; + short | recursive ) echo "Configuration of sntp 4.2.8p17:";; esac cat <<\_ACEOF @@ -1749,7 +1749,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sntp configure 4.2.8p16 +sntp configure 4.2.8p17 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2406,7 +2406,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sntp $as_me 4.2.8p16, which was +It was created by sntp $as_me 4.2.8p17, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3817,7 +3817,7 @@ fi # Define the identity of the package. PACKAGE='sntp' - VERSION='4.2.8p16' + VERSION='4.2.8p17' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -28264,7 +28264,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sntp $as_me 4.2.8p16, which was +This file was extended by sntp $as_me 4.2.8p17, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28333,7 +28333,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sntp config.status 4.2.8p16 +sntp config.status 4.2.8p17 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/sntp/crypto.c b/sntp/crypto.c index 5456c092aff8..7807ccc00b03 100644 --- a/sntp/crypto.c +++ b/sntp/crypto.c @@ -10,11 +10,6 @@ #include "crypto.h" #include <ctype.h> #include "isc/string.h" -#include "ntp_md5.h" - -#ifndef EVP_MAX_MD_SIZE -# define EVP_MAX_MD_SIZE 32 -#endif struct key *key_ptr; size_t key_cnt = 0; diff --git a/sntp/crypto.h b/sntp/crypto.h index 961dca042a9f..4e75df20a9a3 100644 --- a/sntp/crypto.h +++ b/sntp/crypto.h @@ -8,7 +8,6 @@ #include <ntp_fp.h> #include <ntp.h> #include <ntp_stdlib.h> -#include <ntp_md5.h> /* provides OpenSSL digest API */ #include "utilities.h" #include "sntp-opts.h" diff --git a/sntp/include/version.def b/sntp/include/version.def index c8c4ebe3d900..bba075cfff5f 100644 --- a/sntp/include/version.def +++ b/sntp/include/version.def @@ -1 +1 @@ -version = '4.2.8p16'; +version = '4.2.8p17'; diff --git a/sntp/include/version.texi b/sntp/include/version.texi index 75c06dd43af0..eaead228a2d3 100644 --- a/sntp/include/version.texi +++ b/sntp/include/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 31 May 2023 -@set EDITION 4.2.8p16 -@set VERSION 4.2.8p16 +@set UPDATED 06 June 2023 +@set EDITION 4.2.8p17 +@set VERSION 4.2.8p17 diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi index 7f31eddb8b4d..4c03b3a498f3 100644 --- a/sntp/invoke-sntp.texi +++ b/sntp/invoke-sntp.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-sntp.texi) # -# It has been AutoGen-ed May 31, 2023 at 02:48:07 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:36:12 AM by AutoGen 5.18.16 # From the definitions sntp-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -101,7 +101,7 @@ with a status code of 0. @exampleindent 0 @example -sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p16 +sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p17 Usage: sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \ [ hostname-or-IP ...] Flg Arg Option-Name Description diff --git a/sntp/m4/version.m4 b/sntp/m4/version.m4 index aef0b0c5a6fd..95deaa41c695 100644 --- a/sntp/m4/version.m4 +++ b/sntp/m4/version.m4 @@ -1 +1 @@ -m4_define([VERSION_NUMBER],[4.2.8p16]) +m4_define([VERSION_NUMBER],[4.2.8p17]) diff --git a/sntp/scm-rev b/sntp/scm-rev index c2fda3ce6d2e..5e3d42f5e853 100644 --- a/sntp/scm-rev +++ b/sntp/scm-rev @@ -1 +1 @@ -1.3996 +1.4004 diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index d57f335e976d..29c726cb5973 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed May 31, 2023 at 02:47:47 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:35:52 AM by AutoGen 5.18.16 * From the definitions sntp-opts.def * and the template file options * @@ -74,7 +74,7 @@ extern FILE * option_usage_fp; * static const strings for sntp options */ static char const sntp_opt_strs[2567] = -/* 0 */ "sntp 4.2.8p16\n" +/* 0 */ "sntp 4.2.8p17\n" "Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -160,7 +160,7 @@ static char const sntp_opt_strs[2567] = /* 2313 */ "LOAD_OPTS\0" /* 2323 */ "no-load-opts\0" /* 2336 */ "SNTP\0" -/* 2341 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p16\n" +/* 2341 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p17\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n" "\t\t[ hostname-or-IP ...]\n\0" /* 2501 */ "$HOME\0" @@ -168,7 +168,7 @@ static char const sntp_opt_strs[2567] = /* 2509 */ ".ntprc\0" /* 2516 */ "https://bugs.ntp.org, bugs@ntp.org\0" /* 2551 */ "\n\0" -/* 2553 */ "sntp 4.2.8p16"; +/* 2553 */ "sntp 4.2.8p17"; /** * ipv4 option description with @@ -1180,7 +1180,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via sntpOptions.pzCopyright */ - puts(_("sntp 4.2.8p16\n\ + puts(_("sntp 4.2.8p17\n\ Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1270,7 +1270,7 @@ implied warranty.\n")); puts(_("load options from a config file")); /* referenced via sntpOptions.pzUsageTitle */ - puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p16\n\ + puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p17\n\ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\ \t\t[ hostname-or-IP ...]\n")); @@ -1278,7 +1278,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\ puts(_("\n")); /* referenced via sntpOptions.pzFullVersion */ - puts(_("sntp 4.2.8p16")); + puts(_("sntp 4.2.8p17")); /* referenced via sntpOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index e8bee64a9cdd..a7cff4d550b0 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) * - * It has been AutoGen-ed May 31, 2023 at 02:47:47 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:35:52 AM by AutoGen 5.18.16 * From the definitions sntp-opts.def * and the template file options * @@ -99,9 +99,9 @@ typedef enum { /** count of all options for sntp */ #define OPTION_CT 23 /** sntp version */ -#define SNTP_VERSION "4.2.8p16" +#define SNTP_VERSION "4.2.8p17" /** Full sntp version text */ -#define SNTP_FULL_VERSION "sntp 4.2.8p16" +#define SNTP_FULL_VERSION "sntp 4.2.8p17" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman index a1fc294e2dc9..7d532020c280 100644 --- a/sntp/sntp.1sntpman +++ b/sntp/sntp.1sntpman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH sntp 1sntpman "31 May 2023" "4.2.8p16" "User Commands" +.TH sntp 1sntpman "06 Jun 2023" "4.2.8p17" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:48:09 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:36:14 AM by AutoGen 5.18.16 .\" From the definitions sntp-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc index 0c9753955405..0f58ff4090af 100644 --- a/sntp/sntp.1sntpmdoc +++ b/sntp/sntp.1sntpmdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt SNTP 1sntpmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (sntp-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:48:05 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:36:10 AM by AutoGen 5.18.16 .\" From the definitions sntp-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/sntp/sntp.html b/sntp/sntp.html index bfa3aa6ace98..71d3c35d439c 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -53,7 +53,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. </p> -<p>This document applies to version 4.2.8p16 of <code>sntp</code>. +<p>This document applies to version 4.2.8p17 of <code>sntp</code>. </p> <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -226,7 +226,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p16 +<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p17 Usage: sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \ [ hostname-or-IP ...] Flg Arg Option-Name Description diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in index 61768840982f..ca4ddea8e35c 100644 --- a/sntp/sntp.man.in +++ b/sntp/sntp.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH sntp @SNTP_MS@ "31 May 2023" "4.2.8p16" "User Commands" +.TH sntp @SNTP_MS@ "06 Jun 2023" "4.2.8p17" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:48:09 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:36:14 AM by AutoGen 5.18.16 .\" From the definitions sntp-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in index 9585720e18b7..3e5fa337725f 100644 --- a/sntp/sntp.mdoc.in +++ b/sntp/sntp.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt SNTP @SNTP_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (sntp-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 02:48:05 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:36:10 AM by AutoGen 5.18.16 .\" From the definitions sntp-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am index a1d37ecab207..def10b301c73 100644 --- a/tests/libntp/Makefile.am +++ b/tests/libntp/Makefile.am @@ -8,10 +8,19 @@ std_unity_list = \ $(abs_srcdir)/testconf.yml \ $(NULL) +# +# Note: the rules to generate run-c_filename.c from c_filename.c below +# use the gmake $< construct for the first prerequisite, which +# does not work on FreeBSD make. Use gmake when adding a new +# test source file, and check in the resulting run-*.c. +# + run_unity = ruby $(std_unity_list) EXTRA_DIST = \ testconf.yml \ + data/ntp.keys \ + data/mills,david-03.jpg \ $(NULL) check_PROGRAMS = \ @@ -26,6 +35,7 @@ check_PROGRAMS = \ test-calyearstart \ test-clocktime \ test-decodenetnum \ + test-digests \ test-hextoint \ test-hextolfp \ test-humandate \ @@ -58,13 +68,13 @@ check_PROGRAMS = \ test-ymd2yd \ $(NULL) -LDADD = \ +LDADD = \ $(top_builddir)/sntp/unity/libunity.a \ - $(top_builddir)/libntp/libntp.a \ - $(LDADD_LIBNTP) \ - $(PTHREAD_LIBS) \ - $(LDADD_NTP) \ - $(LIBM) \ + $(top_builddir)/libntp/libntp.a \ + $(LDADD_LIBNTP) \ + $(PTHREAD_LIBS) \ + $(LDADD_NTP) \ + $(LIBM) \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) @@ -92,6 +102,7 @@ BUILT_SOURCES += \ $(srcdir)/run-calyearstart.c \ $(srcdir)/run-clocktime.c \ $(srcdir)/run-decodenetnum.c \ + $(srcdir)/run-digests.c \ $(srcdir)/run-hextoint.c \ $(srcdir)/run-hextolfp.c \ $(srcdir)/run-humandate.c \ @@ -263,6 +274,22 @@ $(srcdir)/run-decodenetnum.c: $(srcdir)/decodenetnum.c $(std_unity_list) ### +test_digests_SOURCES = \ + digests.c \ + run-digests.c \ + $(NULL) + +$(srcdir)/run-digests.c: $(srcdir)/digests.c $(std_unity_list) + $(run_unity) $< $@ + +nodist_test_digests_SOURCES = srcdir.c +CLEANFILES += srcdir.c + +srcdir.c: Makefile + $(AM_V_GEN)echo 'const char srcdir[] = "$(srcdir)";' >$@ + +### + test_hextoint_SOURCES = \ hextoint.c \ run-hextoint.c \ diff --git a/tests/libntp/Makefile.in b/tests/libntp/Makefile.in index 2a320f27952d..c982df256def 100644 --- a/tests/libntp/Makefile.in +++ b/tests/libntp/Makefile.in @@ -93,11 +93,11 @@ check_PROGRAMS = test-a_md5encrypt$(EXEEXT) test-atoint$(EXEEXT) \ test-buftvtots$(EXEEXT) test-calendar$(EXEEXT) \ test-caljulian$(EXEEXT) test-caltontp$(EXEEXT) \ test-calyearstart$(EXEEXT) test-clocktime$(EXEEXT) \ - test-decodenetnum$(EXEEXT) test-hextoint$(EXEEXT) \ - test-hextolfp$(EXEEXT) test-humandate$(EXEEXT) \ - test-lfpfunc$(EXEEXT) test-lfptostr$(EXEEXT) \ - test-modetoa$(EXEEXT) test-msyslog$(EXEEXT) \ - test-netof$(EXEEXT) test-numtoa$(EXEEXT) \ + test-decodenetnum$(EXEEXT) test-digests$(EXEEXT) \ + test-hextoint$(EXEEXT) test-hextolfp$(EXEEXT) \ + test-humandate$(EXEEXT) test-lfpfunc$(EXEEXT) \ + test-lfptostr$(EXEEXT) test-modetoa$(EXEEXT) \ + test-msyslog$(EXEEXT) test-netof$(EXEEXT) test-numtoa$(EXEEXT) \ test-numtohost$(EXEEXT) test-octtoint$(EXEEXT) \ test-prettydate$(EXEEXT) test-realpath$(EXEEXT) \ test-recvbuff$(EXEEXT) test-refidsmear$(EXEEXT) \ @@ -273,6 +273,16 @@ test_decodenetnum_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(test_decodenetnum_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ +am_test_digests_OBJECTS = digests.$(OBJEXT) run-digests.$(OBJEXT) \ + $(am__objects_1) +nodist_test_digests_OBJECTS = srcdir.$(OBJEXT) +test_digests_OBJECTS = $(am_test_digests_OBJECTS) \ + $(nodist_test_digests_OBJECTS) +test_digests_LDADD = $(LDADD) +test_digests_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_hextoint_OBJECTS = hextoint.$(OBJEXT) run-hextoint.$(OBJEXT) \ $(am__objects_1) test_hextoint_OBJECTS = $(am_test_hextoint_OBJECTS) @@ -536,19 +546,20 @@ am__depfiles_remade = ./$(DEPDIR)/a_md5encrypt.Po \ ./$(DEPDIR)/atoint.Po ./$(DEPDIR)/atouint.Po \ ./$(DEPDIR)/authkeys.Po ./$(DEPDIR)/buftvtots.Po \ ./$(DEPDIR)/calendar.Po ./$(DEPDIR)/calyearstart.Po \ - ./$(DEPDIR)/clocktime.Po ./$(DEPDIR)/hextoint.Po \ - ./$(DEPDIR)/hextolfp.Po ./$(DEPDIR)/humandate.Po \ - ./$(DEPDIR)/lfpfunc.Po ./$(DEPDIR)/lfptest.Po \ - ./$(DEPDIR)/lfptostr.Po ./$(DEPDIR)/modetoa.Po \ - ./$(DEPDIR)/msyslog.Po ./$(DEPDIR)/netof.Po \ - ./$(DEPDIR)/numtoa.Po ./$(DEPDIR)/numtohost.Po \ - ./$(DEPDIR)/octtoint.Po ./$(DEPDIR)/prettydate.Po \ - ./$(DEPDIR)/realpath.Po ./$(DEPDIR)/recvbuff.Po \ - ./$(DEPDIR)/refidsmear.Po ./$(DEPDIR)/refnumtoa.Po \ - ./$(DEPDIR)/run-a_md5encrypt.Po ./$(DEPDIR)/run-atoint.Po \ - ./$(DEPDIR)/run-atouint.Po ./$(DEPDIR)/run-authkeys.Po \ - ./$(DEPDIR)/run-buftvtots.Po ./$(DEPDIR)/run-calendar.Po \ - ./$(DEPDIR)/run-calyearstart.Po ./$(DEPDIR)/run-clocktime.Po \ + ./$(DEPDIR)/clocktime.Po ./$(DEPDIR)/digests.Po \ + ./$(DEPDIR)/hextoint.Po ./$(DEPDIR)/hextolfp.Po \ + ./$(DEPDIR)/humandate.Po ./$(DEPDIR)/lfpfunc.Po \ + ./$(DEPDIR)/lfptest.Po ./$(DEPDIR)/lfptostr.Po \ + ./$(DEPDIR)/modetoa.Po ./$(DEPDIR)/msyslog.Po \ + ./$(DEPDIR)/netof.Po ./$(DEPDIR)/numtoa.Po \ + ./$(DEPDIR)/numtohost.Po ./$(DEPDIR)/octtoint.Po \ + ./$(DEPDIR)/prettydate.Po ./$(DEPDIR)/realpath.Po \ + ./$(DEPDIR)/recvbuff.Po ./$(DEPDIR)/refidsmear.Po \ + ./$(DEPDIR)/refnumtoa.Po ./$(DEPDIR)/run-a_md5encrypt.Po \ + ./$(DEPDIR)/run-atoint.Po ./$(DEPDIR)/run-atouint.Po \ + ./$(DEPDIR)/run-authkeys.Po ./$(DEPDIR)/run-buftvtots.Po \ + ./$(DEPDIR)/run-calendar.Po ./$(DEPDIR)/run-calyearstart.Po \ + ./$(DEPDIR)/run-clocktime.Po ./$(DEPDIR)/run-digests.Po \ ./$(DEPDIR)/run-hextoint.Po ./$(DEPDIR)/run-hextolfp.Po \ ./$(DEPDIR)/run-humandate.Po ./$(DEPDIR)/run-lfpfunc.Po \ ./$(DEPDIR)/run-lfptostr.Po ./$(DEPDIR)/run-modetoa.Po \ @@ -565,8 +576,9 @@ am__depfiles_remade = ./$(DEPDIR)/a_md5encrypt.Po \ ./$(DEPDIR)/run-uglydate.Po ./$(DEPDIR)/run-vi64ops.Po \ ./$(DEPDIR)/run-ymd2yd.Po ./$(DEPDIR)/sbprintf.Po \ ./$(DEPDIR)/sfptostr.Po ./$(DEPDIR)/sockaddrtest.Po \ - ./$(DEPDIR)/socktoa.Po ./$(DEPDIR)/ssl_init.Po \ - ./$(DEPDIR)/statestr.Po ./$(DEPDIR)/test-libntp.Po \ + ./$(DEPDIR)/socktoa.Po ./$(DEPDIR)/srcdir.Po \ + ./$(DEPDIR)/ssl_init.Po ./$(DEPDIR)/statestr.Po \ + ./$(DEPDIR)/test-libntp.Po \ ./$(DEPDIR)/test_caljulian-caljulian.Po \ ./$(DEPDIR)/test_caljulian-run-caljulian.Po \ ./$(DEPDIR)/test_caljulian-test-libntp.Po \ @@ -606,7 +618,8 @@ SOURCES = $(test_a_md5encrypt_SOURCES) $(test_atoint_SOURCES) \ $(test_buftvtots_SOURCES) $(test_calendar_SOURCES) \ $(test_caljulian_SOURCES) $(test_caltontp_SOURCES) \ $(test_calyearstart_SOURCES) $(test_clocktime_SOURCES) \ - $(test_decodenetnum_SOURCES) $(test_hextoint_SOURCES) \ + $(test_decodenetnum_SOURCES) $(test_digests_SOURCES) \ + $(nodist_test_digests_SOURCES) $(test_hextoint_SOURCES) \ $(test_hextolfp_SOURCES) $(test_humandate_SOURCES) \ $(test_lfpfunc_SOURCES) $(test_lfptostr_SOURCES) \ $(test_modetoa_SOURCES) $(test_msyslog_SOURCES) \ @@ -627,22 +640,22 @@ DIST_SOURCES = $(test_a_md5encrypt_SOURCES) $(test_atoint_SOURCES) \ $(test_buftvtots_SOURCES) $(test_calendar_SOURCES) \ $(test_caljulian_SOURCES) $(test_caltontp_SOURCES) \ $(test_calyearstart_SOURCES) $(test_clocktime_SOURCES) \ - $(test_decodenetnum_SOURCES) $(test_hextoint_SOURCES) \ - $(test_hextolfp_SOURCES) $(test_humandate_SOURCES) \ - $(test_lfpfunc_SOURCES) $(test_lfptostr_SOURCES) \ - $(test_modetoa_SOURCES) $(test_msyslog_SOURCES) \ - $(test_netof_SOURCES) $(test_numtoa_SOURCES) \ - $(test_numtohost_SOURCES) $(test_octtoint_SOURCES) \ - $(test_prettydate_SOURCES) $(test_realpath_SOURCES) \ - $(test_recvbuff_SOURCES) $(test_refidsmear_SOURCES) \ - $(test_refnumtoa_SOURCES) $(test_sbprintf_SOURCES) \ - $(test_sfptostr_SOURCES) $(test_socktoa_SOURCES) \ - $(test_ssl_init_SOURCES) $(test_statestr_SOURCES) \ - $(test_strtolfp_SOURCES) $(test_timespecops_SOURCES) \ - $(test_timevalops_SOURCES) $(test_tsafememcmp_SOURCES) \ - $(test_tstotv_SOURCES) $(test_tvtots_SOURCES) \ - $(test_uglydate_SOURCES) $(test_vi64ops_SOURCES) \ - $(test_ymd2yd_SOURCES) + $(test_decodenetnum_SOURCES) $(test_digests_SOURCES) \ + $(test_hextoint_SOURCES) $(test_hextolfp_SOURCES) \ + $(test_humandate_SOURCES) $(test_lfpfunc_SOURCES) \ + $(test_lfptostr_SOURCES) $(test_modetoa_SOURCES) \ + $(test_msyslog_SOURCES) $(test_netof_SOURCES) \ + $(test_numtoa_SOURCES) $(test_numtohost_SOURCES) \ + $(test_octtoint_SOURCES) $(test_prettydate_SOURCES) \ + $(test_realpath_SOURCES) $(test_recvbuff_SOURCES) \ + $(test_refidsmear_SOURCES) $(test_refnumtoa_SOURCES) \ + $(test_sbprintf_SOURCES) $(test_sfptostr_SOURCES) \ + $(test_socktoa_SOURCES) $(test_ssl_init_SOURCES) \ + $(test_statestr_SOURCES) $(test_strtolfp_SOURCES) \ + $(test_timespecops_SOURCES) $(test_timevalops_SOURCES) \ + $(test_tsafememcmp_SOURCES) $(test_tstotv_SOURCES) \ + $(test_tvtots_SOURCES) $(test_uglydate_SOURCES) \ + $(test_vi64ops_SOURCES) $(test_ymd2yd_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -1150,42 +1163,51 @@ BUILT_SOURCES = $(srcdir)/run-a_md5encrypt.c $(srcdir)/run-atoint.c \ $(srcdir)/run-buftvtots.c $(srcdir)/run-calendar.c \ $(srcdir)/run-caljulian.c $(srcdir)/run-caltontp.c \ $(srcdir)/run-calyearstart.c $(srcdir)/run-clocktime.c \ - $(srcdir)/run-decodenetnum.c $(srcdir)/run-hextoint.c \ - $(srcdir)/run-hextolfp.c $(srcdir)/run-humandate.c \ - $(srcdir)/run-lfpfunc.c $(srcdir)/run-lfptostr.c \ - $(srcdir)/run-modetoa.c $(srcdir)/run-msyslog.c \ - $(srcdir)/run-netof.c $(srcdir)/run-numtoa.c \ - $(srcdir)/run-numtohost.c $(srcdir)/run-octtoint.c \ - $(srcdir)/run-prettydate.c $(srcdir)/run-realpath.c \ - $(srcdir)/run-recvbuff.c $(srcdir)/run-refidsmear.c \ - $(srcdir)/run-refnumtoa.c $(srcdir)/run-sbprintf.c \ - $(srcdir)/run-sfptostr.c $(srcdir)/run-socktoa.c \ - $(srcdir)/run-ssl_init.c $(srcdir)/run-statestr.c \ - $(srcdir)/run-strtolfp.c $(srcdir)/run-timevalops.c \ - $(srcdir)/run-timespecops.c $(srcdir)/run-tsafememcmp.c \ - $(srcdir)/run-tstotv.c $(srcdir)/run-tvtots.c \ - $(srcdir)/run-uglydate.c $(srcdir)/run-vi64ops.c \ - $(srcdir)/run-ymd2yd.c $(NULL) check-libntp check-libunity \ - .deps-ver -CLEANFILES = check-libntp .deps-ver + $(srcdir)/run-decodenetnum.c $(srcdir)/run-digests.c \ + $(srcdir)/run-hextoint.c $(srcdir)/run-hextolfp.c \ + $(srcdir)/run-humandate.c $(srcdir)/run-lfpfunc.c \ + $(srcdir)/run-lfptostr.c $(srcdir)/run-modetoa.c \ + $(srcdir)/run-msyslog.c $(srcdir)/run-netof.c \ + $(srcdir)/run-numtoa.c $(srcdir)/run-numtohost.c \ + $(srcdir)/run-octtoint.c $(srcdir)/run-prettydate.c \ + $(srcdir)/run-realpath.c $(srcdir)/run-recvbuff.c \ + $(srcdir)/run-refidsmear.c $(srcdir)/run-refnumtoa.c \ + $(srcdir)/run-sbprintf.c $(srcdir)/run-sfptostr.c \ + $(srcdir)/run-socktoa.c $(srcdir)/run-ssl_init.c \ + $(srcdir)/run-statestr.c $(srcdir)/run-strtolfp.c \ + $(srcdir)/run-timevalops.c $(srcdir)/run-timespecops.c \ + $(srcdir)/run-tsafememcmp.c $(srcdir)/run-tstotv.c \ + $(srcdir)/run-tvtots.c $(srcdir)/run-uglydate.c \ + $(srcdir)/run-vi64ops.c $(srcdir)/run-ymd2yd.c $(NULL) \ + check-libntp check-libunity .deps-ver +CLEANFILES = srcdir.c check-libntp .deps-ver DISTCLEANFILES = $(DEPDIR)/deps-ver std_unity_list = \ $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ $(abs_srcdir)/testconf.yml \ $(NULL) + +# +# Note: the rules to generate run-c_filename.c from c_filename.c below +# use the gmake $< construct for the first prerequisite, which +# does not work on FreeBSD make. Use gmake when adding a new +# test source file, and check in the resulting run-*.c. +# run_unity = ruby $(std_unity_list) EXTRA_DIST = \ testconf.yml \ + data/ntp.keys \ + data/mills,david-03.jpg \ $(NULL) LDADD = \ $(top_builddir)/sntp/unity/libunity.a \ - $(top_builddir)/libntp/libntp.a \ - $(LDADD_LIBNTP) \ - $(PTHREAD_LIBS) \ - $(LDADD_NTP) \ - $(LIBM) \ + $(top_builddir)/libntp/libntp.a \ + $(LDADD_LIBNTP) \ + $(PTHREAD_LIBS) \ + $(LDADD_NTP) \ + $(LIBM) \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) $(NTP_HARD_CFLAGS) @@ -1299,6 +1321,14 @@ test_decodenetnum_SOURCES = \ ### +test_digests_SOURCES = \ + digests.c \ + run-digests.c \ + $(NULL) + +nodist_test_digests_SOURCES = srcdir.c + +### test_hextoint_SOURCES = \ hextoint.c \ run-hextoint.c \ @@ -1613,6 +1643,10 @@ test-decodenetnum$(EXEEXT): $(test_decodenetnum_OBJECTS) $(test_decodenetnum_DEP @rm -f test-decodenetnum$(EXEEXT) $(AM_V_CCLD)$(test_decodenetnum_LINK) $(test_decodenetnum_OBJECTS) $(test_decodenetnum_LDADD) $(LIBS) +test-digests$(EXEEXT): $(test_digests_OBJECTS) $(test_digests_DEPENDENCIES) $(EXTRA_test_digests_DEPENDENCIES) + @rm -f test-digests$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_digests_OBJECTS) $(test_digests_LDADD) $(LIBS) + test-hextoint$(EXEEXT): $(test_hextoint_OBJECTS) $(test_hextoint_DEPENDENCIES) $(EXTRA_test_hextoint_DEPENDENCIES) @rm -f test-hextoint$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_hextoint_OBJECTS) $(test_hextoint_LDADD) $(LIBS) @@ -1747,6 +1781,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calyearstart.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clocktime.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/digests.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hextoint.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hextolfp.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/humandate.Po@am__quote@ # am--include-marker @@ -1772,6 +1807,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-calendar.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-calyearstart.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-clocktime.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-digests.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-hextoint.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-hextolfp.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-humandate.Po@am__quote@ # am--include-marker @@ -1805,6 +1841,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfptostr.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockaddrtest.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socktoa.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srcdir.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl_init.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statestr.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-libntp.Po@am__quote@ # am--include-marker @@ -2288,6 +2325,13 @@ test-decodenetnum.log: test-decodenetnum$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-digests.log: test-digests$(EXEEXT) + @p='test-digests$(EXEEXT)'; \ + b='test-digests'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) test-hextoint.log: test-hextoint$(EXEEXT) @p='test-hextoint$(EXEEXT)'; \ b='test-hextoint'; \ @@ -2604,6 +2648,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/calendar.Po -rm -f ./$(DEPDIR)/calyearstart.Po -rm -f ./$(DEPDIR)/clocktime.Po + -rm -f ./$(DEPDIR)/digests.Po -rm -f ./$(DEPDIR)/hextoint.Po -rm -f ./$(DEPDIR)/hextolfp.Po -rm -f ./$(DEPDIR)/humandate.Po @@ -2629,6 +2674,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/run-calendar.Po -rm -f ./$(DEPDIR)/run-calyearstart.Po -rm -f ./$(DEPDIR)/run-clocktime.Po + -rm -f ./$(DEPDIR)/run-digests.Po -rm -f ./$(DEPDIR)/run-hextoint.Po -rm -f ./$(DEPDIR)/run-hextolfp.Po -rm -f ./$(DEPDIR)/run-humandate.Po @@ -2662,6 +2708,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/sfptostr.Po -rm -f ./$(DEPDIR)/sockaddrtest.Po -rm -f ./$(DEPDIR)/socktoa.Po + -rm -f ./$(DEPDIR)/srcdir.Po -rm -f ./$(DEPDIR)/ssl_init.Po -rm -f ./$(DEPDIR)/statestr.Po -rm -f ./$(DEPDIR)/test-libntp.Po @@ -2737,6 +2784,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/calendar.Po -rm -f ./$(DEPDIR)/calyearstart.Po -rm -f ./$(DEPDIR)/clocktime.Po + -rm -f ./$(DEPDIR)/digests.Po -rm -f ./$(DEPDIR)/hextoint.Po -rm -f ./$(DEPDIR)/hextolfp.Po -rm -f ./$(DEPDIR)/humandate.Po @@ -2762,6 +2810,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/run-calendar.Po -rm -f ./$(DEPDIR)/run-calyearstart.Po -rm -f ./$(DEPDIR)/run-clocktime.Po + -rm -f ./$(DEPDIR)/run-digests.Po -rm -f ./$(DEPDIR)/run-hextoint.Po -rm -f ./$(DEPDIR)/run-hextolfp.Po -rm -f ./$(DEPDIR)/run-humandate.Po @@ -2795,6 +2844,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/sfptostr.Po -rm -f ./$(DEPDIR)/sockaddrtest.Po -rm -f ./$(DEPDIR)/socktoa.Po + -rm -f ./$(DEPDIR)/srcdir.Po -rm -f ./$(DEPDIR)/ssl_init.Po -rm -f ./$(DEPDIR)/statestr.Po -rm -f ./$(DEPDIR)/test-libntp.Po @@ -2888,6 +2938,12 @@ $(srcdir)/run-clocktime.c: $(srcdir)/clocktime.c $(std_unity_list) $(srcdir)/run-decodenetnum.c: $(srcdir)/decodenetnum.c $(std_unity_list) $(run_unity) $< $@ +$(srcdir)/run-digests.c: $(srcdir)/digests.c $(std_unity_list) + $(run_unity) $< $@ + +srcdir.c: Makefile + $(AM_V_GEN)echo 'const char srcdir[] = "$(srcdir)";' >$@ + $(srcdir)/run-hextoint.c: $(srcdir)/hextoint.c $(std_unity_list) $(run_unity) $< $@ diff --git a/tests/libntp/data/mills,david-03.jpg b/tests/libntp/data/mills,david-03.jpg Binary files differnew file mode 100644 index 000000000000..c164eea2cf33 --- /dev/null +++ b/tests/libntp/data/mills,david-03.jpg diff --git a/tests/libntp/data/ntp.keys b/tests/libntp/data/ntp.keys new file mode 100644 index 000000000000..6c8c743fd7d2 --- /dev/null +++ b/tests/libntp/data/ntp.keys @@ -0,0 +1,34 @@ +# This unit test ntp.keys file has hard-coded the current set +# of OpenSSL-supported digest algorithms. It needs to be updated +# after newer algorithms are available. The current list can be +# obtained with: +# +# ntpq -c "help keytype" +# +# tests/libntp/digest.c similarly hardcodes the list of digests +# to test. +# +# Each digest is tested twice with keyids separated by 50 for +# plaintext and hex-encoded keys. + + 1 AES128CMAC X~A=%NWlo]p$dGq,S3M9 + 2 MD4 oV'8?f+J5`_EOvW!B,R` + 3 MD5 >b^IZa4>K6:Au=KS>S-6 + 4 MDC2 b@XOS~6VZ.E9Qv!CJYV, + 5 RIPEMD160 I89p}f6QopwC\LwHBm;e + 6 SHA1 A;H=E;.m4N%t%EeJ90[d + 7 SHAKE128 |HxLoa,mzG<"y>^TI_(1 + 8 MD5 306+^SHLV5{"v7W`U3aY # unused so far + 9 MD5 lGyKZgsI_Pi"y"8JAT98 # unused +10 MD5 2:VO]Q5u%/b&}.<P?T~9 # unused + +51 AES128CMAC d0cd9f3ee181769ca7cccaada09f093c5fe8e628 +52 MD4 7080bc47eea6b379b2ff841805a144fb4a241a16 +53 MD5 b4c25b70f1fda16a7fef7552c9371e0cedee2e3c +54 MDC2 3cb1d4633a460179a7c96aed6c6a9273c3c98af8 +55 RIPEMD160 6028ec169bfbe55ab61ffa7baa34b482020f0619 +56 SHA1 17d96a86eb9b9075f33e1c0a08bb2bb61e916e33 +57 SHAKE128 70da1a91030eb91836c1cf76cf67ddfd6b96fa91 +58 SHA1 7ce5deea7569d7423d5e1b497c8eb3bfeff852d5 # unused so far +59 SHA1 9fd568e8f371deae54a65bc50b52bbe1f6529589 # unused +60 SHA1 ce85046978a4df8366e102c4f1267399bbc25737 # unused diff --git a/tests/libntp/digests.c b/tests/libntp/digests.c new file mode 100644 index 000000000000..03e9ef1b838e --- /dev/null +++ b/tests/libntp/digests.c @@ -0,0 +1,415 @@ +#include "config.h" + +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + +#include "unity.h" +#include "ntp.h" +#include "ntp_stdlib.h" + +/* + * tests/libntp/data/ntp.keys has two keys for each algorithm, 50 keyids apart. + * The first is 20 random ASCII chars, the 2nd 40 random hex values. + */ +#define HEX_KEYID_OFFSET 50 + +/* in generated srcdir.c */ +extern const char srcdir[]; + +/* needed by authtrust() */ +u_long current_time; + +static bool setup; +static u_int32 * pkt; +static size_t pkt_sz; +static u_char * mac; + +/* helper routine */ +void dump_mac(keyid_t keyid, u_char *pmac, size_t octets); + + +/* unity calls setUp before each test routine */ +void setUp(void); +void +setUp(void) +{ + static bool done_once; + const char msg_rel_fname[] = "data/mills,david-03.jpg"; + const char keys_rel_fname[] = "data/ntp.keys"; + char msg_fname[PATH_MAX]; + char keys_fname[PATH_MAX]; + int msgf; + int result; + struct stat msg_stat; + u_char * msg; + size_t msg_sz; + size_t pad_sz; + ssize_t octets; + + if (done_once) { + return; + } + done_once = TRUE; + + init_auth(); + + snprintf(keys_fname, sizeof(keys_fname), "%s/%s", srcdir, + keys_rel_fname); + if (! authreadkeys(keys_fname)) { + fprintf(stderr, "could not load keys %s\n", keys_fname); + return; + } + + snprintf(msg_fname, sizeof(msg_fname), "%s/%s", srcdir, msg_rel_fname); + msgf = open(msg_fname, O_RDONLY); + if (msgf < 0) { + fprintf(stderr, "could not open msg file %s\n", msg_fname); + return; + } + + result = fstat(msgf, &msg_stat); + if (result < 0) { + fprintf(stderr, "could not get msg file %s size\n", msg_fname); + return; + } + + msg_sz = msg_stat.st_size; + /* round up to next multiple of 4 as needed by MD5authencrypt() */ + pad_sz = sizeof(u_int32) - (msg_sz % sizeof(u_int32)); + if (sizeof(u_int32) == pad_sz) { + pad_sz = 0; + } + /* allocate room for the message, key ID, and MAC */ + msg = emalloc_zero(msg_sz + pad_sz + MAX_MAC_LEN); + octets = read(msgf, msg, msg_sz); + if (octets != msg_sz) { + fprintf(stderr, "could not read msg from file %s, %u != %u\n", + msg_fname, (u_int)octets, (u_int)msg_sz); + return; + } + zero_mem(msg + msg_sz, pad_sz); + pkt_sz = msg_sz + pad_sz; + mac = (void *)((u_char *)msg + pkt_sz); + pkt = (void *)msg; + + setup = TRUE; +} + +/* reduce code duplication with an ugly macro */ +#define TEST_ONE_DIGEST(key, exp_sz, exp_mac) \ +do { \ + size_t res_sz; \ + \ + zero_mem(mac, MAX_MAC_LEN); \ + if (!auth_findkey(key)) { \ + TEST_IGNORE_MESSAGE("MAC unsupported on this system"); \ + return; \ + } \ + authtrust((key), 1); \ + \ + res_sz = authencrypt((key), pkt, pkt_sz); \ + if (KEY_MAC_LEN == res_sz) { \ + TEST_IGNORE_MESSAGE("Likely OpenSSL 3 failed digest " \ + "init."); \ + return; \ + } \ + TEST_ASSERT_EQUAL_UINT((u_int)((exp_sz) + KEY_MAC_LEN), res_sz);\ + dump_mac((key), mac, res_sz); \ + TEST_ASSERT_EQUAL_HEX8_ARRAY((exp_mac), mac, MAX_MAC_LEN); \ +} while (FALSE) + + +#define AES128CMAC_KEYID 1 +#undef KEYID_A +#define KEYID_A AES128CMAC_KEYID +#undef DG_SZ +#define DG_SZ 16 +#undef KEYID_B +#define KEYID_B (KEYID_A + HEX_KEYID_OFFSET) +void test_Digest_AES128CMAC(void); +void test_Digest_AES128CMAC(void) +{ +#if defined(OPENSSL) && defined(ENABLE_CMAC) + u_char expectedA[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_A, + 0x34, 0x5b, 0xcf, 0xa8, + 0x85, 0x6e, 0x9d, 0x01, + 0xeb, 0x81, 0x25, 0xc2, + 0xa4, 0xb8, 0x1b, 0xe0 + }; + u_char expectedB[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_B, + 0xd1, 0x04, 0x4e, 0xbf, + 0x79, 0x2d, 0x3a, 0x40, + 0xcd, 0xdc, 0x5a, 0x44, + 0xde, 0xe0, 0x0c, 0x84 + }; + + TEST_ASSERT(setup); + TEST_ONE_DIGEST(KEYID_A, DG_SZ, expectedA); + TEST_ONE_DIGEST(KEYID_B, DG_SZ, expectedB); +#else /* ! (OPENSSL && ENABLE_CMAC) follows */ + TEST_IGNORE_MESSAGE("Skipping, no OPENSSL or not ENABLE_CMAC"); +#endif +} + + +#define MD4_KEYID 2 +#undef KEYID_A +#define KEYID_A MD4_KEYID +#undef DG_SZ +#define DG_SZ 16 +#undef KEYID_B +#define KEYID_B (KEYID_A + HEX_KEYID_OFFSET) +void test_Digest_MD4(void); +void test_Digest_MD4(void) +{ +#ifdef OPENSSL + u_char expectedA[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_A, + 0xf3, 0x39, 0x34, 0xca, + 0xe0, 0x48, 0x26, 0x0f, + 0x13, 0xca, 0x56, 0x9e, + 0xbc, 0x53, 0x9c, 0x66 + }; + u_char expectedB[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_B, + 0x5e, 0xe6, 0x81, 0xf2, + 0x57, 0x57, 0x8a, 0x2b, + 0xa8, 0x76, 0x8e, 0x7a, + 0xc4, 0xf4, 0x34, 0x7e + }; + + TEST_ASSERT(setup); + TEST_ONE_DIGEST(KEYID_A, DG_SZ, expectedA); + TEST_ONE_DIGEST(KEYID_B, DG_SZ, expectedB); +#else /* ! OPENSSL follows */ + TEST_IGNORE_MESSAGE("Skipping, no OPENSSL"); +#endif +} + + +#define MD5_KEYID 3 +#undef KEYID_A +#define KEYID_A MD5_KEYID +#undef DG_SZ +#define DG_SZ 16 +#undef KEYID_B +#define KEYID_B (KEYID_A + HEX_KEYID_OFFSET) +void test_Digest_MD5(void); +void test_Digest_MD5(void) +{ + u_char expectedA[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_A, + 0xa6, 0x8d, 0x3a, 0xfe, + 0x52, 0xe5, 0xf7, 0xe9, + 0x4c, 0x97, 0x72, 0x16, + 0x7c, 0x28, 0x18, 0xaf + }; + u_char expectedB[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_B, + 0xd4, 0x11, 0x2c, 0xc6, + 0x66, 0x74, 0x46, 0x8b, + 0x12, 0xb1, 0x8c, 0x49, + 0xb0, 0x06, 0xda, 0x34 + }; + + TEST_ASSERT(setup); + TEST_ONE_DIGEST(KEYID_A, DG_SZ, expectedA); + TEST_ONE_DIGEST(KEYID_B, DG_SZ, expectedB); +} + + +#define MDC2_KEYID 4 +#undef KEYID_A +#define KEYID_A MDC2_KEYID +#undef DG_SZ +#define DG_SZ 16 +#undef KEYID_B +#define KEYID_B (KEYID_A + HEX_KEYID_OFFSET) +void test_Digest_MDC2(void); +void test_Digest_MDC2(void) +{ +#ifdef OPENSSL + u_char expectedA[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_A, + 0xa0, 0xfc, 0x18, 0xb6, + 0xea, 0xba, 0xa5, 0x27, + 0xc9, 0x64, 0x0e, 0x41, + 0x95, 0x90, 0x5d, 0xf5 + }; + u_char expectedB[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_B, + 0xe3, 0x2c, 0x1e, 0x64, + 0x7f, 0x85, 0x81, 0xe7, + 0x3b, 0xc3, 0x93, 0x5e, + 0xcd, 0x0e, 0x89, 0xeb + }; + + TEST_ASSERT(setup); + TEST_ONE_DIGEST(KEYID_A, DG_SZ, expectedA); + TEST_ONE_DIGEST(KEYID_B, DG_SZ, expectedB); +#else /* ! OPENSSL follows */ + TEST_IGNORE_MESSAGE("Skipping, no OPENSSL"); +#endif +} + + +#define RIPEMD160_KEYID 5 +#undef KEYID_A +#define KEYID_A RIPEMD160_KEYID +#undef DG_SZ +#define DG_SZ 20 +#undef KEYID_B +#define KEYID_B (KEYID_A + HEX_KEYID_OFFSET) +void test_Digest_RIPEMD160(void); +void test_Digest_RIPEMD160(void) +{ +#ifdef OPENSSL + u_char expectedA[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_A, + 0x8c, 0x3e, 0x55, 0xbb, + 0xec, 0x7c, 0xf6, 0x30, + 0xef, 0xd1, 0x45, 0x8c, + 0xdd, 0x29, 0x32, 0x7e, + 0x04, 0x87, 0x6c, 0xd7 + }; + u_char expectedB[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_B, + 0x2d, 0x4a, 0x48, 0xdd, + 0x28, 0x02, 0xb4, 0x9d, + 0xe3, 0x6d, 0x1b, 0x90, + 0x2b, 0xc4, 0x3f, 0xe5, + 0x19, 0x60, 0x12, 0xbc + }; + + TEST_ASSERT(setup); + TEST_ONE_DIGEST(KEYID_A, DG_SZ, expectedA); + TEST_ONE_DIGEST(KEYID_B, DG_SZ, expectedB); +#else /* ! OPENSSL follows */ + TEST_IGNORE_MESSAGE("Skipping, no OPENSSL"); +#endif +} + + +#define SHA1_KEYID 6 +#undef KEYID_A +#define KEYID_A SHA1_KEYID +#undef DG_SZ +#define DG_SZ 20 +#undef KEYID_B +#define KEYID_B (KEYID_A + HEX_KEYID_OFFSET) +void test_Digest_SHA1(void); +void test_Digest_SHA1(void) +{ +#ifdef OPENSSL + u_char expectedA[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_A, + 0xe2, 0xc6, 0x17, 0x71, + 0x03, 0xc1, 0x85, 0x56, + 0x35, 0xc7, 0x4e, 0x75, + 0x79, 0x82, 0x9d, 0xcb, + 0x2d, 0x06, 0x0e, 0xfa + }; + u_char expectedB[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_B, + 0x01, 0x16, 0x37, 0xb4, + 0xf5, 0x2d, 0xe0, 0x97, + 0xaf, 0xd8, 0x58, 0xf7, + 0xad, 0xb3, 0x7e, 0x38, + 0x86, 0x85, 0x78, 0x44 + }; + + TEST_ASSERT(setup); + TEST_ONE_DIGEST(KEYID_A, DG_SZ, expectedA); + TEST_ONE_DIGEST(KEYID_B, DG_SZ, expectedB); +#else /* ! OPENSSL follows */ + TEST_IGNORE_MESSAGE("Skipping, no OPENSSL"); +#endif +} + + +#define SHAKE128_KEYID 7 +#undef KEYID_A +#define KEYID_A SHAKE128_KEYID +#undef DG_SZ +#define DG_SZ 16 +#undef KEYID_B +#define KEYID_B (KEYID_A + HEX_KEYID_OFFSET) +void test_Digest_SHAKE128(void); +void test_Digest_SHAKE128(void) +{ +#ifdef OPENSSL + u_char expectedA[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_A, + 0x5c, 0x0c, 0x1a, 0x85, + 0xad, 0x03, 0xb2, 0x9a, + 0xe4, 0x75, 0x37, 0x93, + 0xaa, 0xa6, 0xcd, 0x76 + }; + u_char expectedB[MAX_MAC_LEN] = + { + 0, 0, 0, KEYID_B, + 0x07, 0x04, 0x63, 0xcc, + 0x46, 0xaf, 0xca, 0x00, + 0x7d, 0xd1, 0x5a, 0x39, + 0xfd, 0x34, 0xca, 0x10 + }; + + TEST_ASSERT(setup); + TEST_ONE_DIGEST(KEYID_A, DG_SZ, expectedA); + TEST_ONE_DIGEST(KEYID_B, DG_SZ, expectedB); +#else /* ! OPENSSL follows */ + TEST_IGNORE_MESSAGE("Skipping, no OPENSSL"); +#endif +} + + +/* + * Dump a MAC in a form easy to cut and paste into the expected declaration. + */ +void dump_mac( + keyid_t keyid, + u_char * pmac, + size_t octets + ) +{ + char dump[128]; + size_t dc = 0; + size_t idx; + + dc += snprintf(dump + dc, sizeof(dump) - dc, "digest with key %u { ", keyid); + + for (idx = 0; idx < octets; idx++) { + if (10 == idx) { + msyslog(LOG_DEBUG, "%s", dump); + dc = 0; + } + if (dc < sizeof(dump)) { + dc += snprintf(dump + dc, sizeof(dump) - dc, + "0x%02x, ", pmac[idx]); + } + } + + if (dc < sizeof(dump)) { + dc += snprintf(dump + dc, sizeof(dump) - dc, "}"); + } + + msyslog(LOG_DEBUG, "%s", dump); +} + diff --git a/tests/libntp/run-digests.c b/tests/libntp/run-digests.c new file mode 100644 index 000000000000..ae574d0e239e --- /dev/null +++ b/tests/libntp/run-digests.c @@ -0,0 +1,80 @@ +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + setUp(); \ + TestFunc(); \ + } \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include <setjmp.h> +#include <stdio.h> +#include "config.h" +#include "ntp.h" +#include "ntp_stdlib.h" +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_Digest_AES128CMAC(void); +extern void test_Digest_MD4(void); +extern void test_Digest_MD5(void); +extern void test_Digest_MDC2(void); +extern void test_Digest_RIPEMD160(void); +extern void test_Digest_SHA1(void); +extern void test_Digest_SHAKE128(void); + + +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_iobufs(int); +extern int change_logfile(const char*, int); +change_iobufs(1); +change_logfile("stderr", 0); +} + +//=======Test Reset Option===== +void resetTest(void); +void resetTest(void) +{ + tearDown(); + setUp(); +} + +char const *progname; + + +//=======MAIN===== +int main(int argc, char *argv[]) +{ + progname = argv[0]; + suite_setup(); + UnityBegin("digests.c"); + RUN_TEST(test_Digest_AES128CMAC, 131); + RUN_TEST(test_Digest_MD4, 168); + RUN_TEST(test_Digest_MD5, 205); + RUN_TEST(test_Digest_MDC2, 238); + RUN_TEST(test_Digest_RIPEMD160, 275); + RUN_TEST(test_Digest_SHA1, 314); + RUN_TEST(test_Digest_SHAKE128, 353); + + return (UnityEnd()); +} diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi index da9f2695f921..2ee45b30970c 100644 --- a/util/invoke-ntp-keygen.texi +++ b/util/invoke-ntp-keygen.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp-keygen.texi) # -# It has been AutoGen-ed May 31, 2023 at 08:03:04 PM by AutoGen 5.18.16 +# It has been AutoGen-ed June 6, 2023 at 04:38:29 AM by AutoGen 5.18.16 # From the definitions ntp-keygen-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -1056,7 +1056,7 @@ with a status code of 0. @exampleindent 0 @example -ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p16 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p17 Usage: ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... Flg Arg Option-Name Description -b Num imbits identity modulus bits diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 47d03516a713..fb3c78fdff51 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c) * - * It has been AutoGen-ed May 31, 2023 at 08:03:01 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:38:24 AM by AutoGen 5.18.16 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -76,7 +76,7 @@ extern FILE * option_usage_fp; * static const strings for ntp-keygen options */ static char const ntp_keygen_opt_strs[2443] = -/* 0 */ "ntp-keygen (ntp) 4.2.8p16\n" +/* 0 */ "ntp-keygen (ntp) 4.2.8p17\n" "Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -169,14 +169,14 @@ static char const ntp_keygen_opt_strs[2443] = /* 2223 */ "no-load-opts\0" /* 2236 */ "no\0" /* 2239 */ "NTP_KEYGEN\0" -/* 2250 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p16\n" +/* 2250 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p17\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" /* 2365 */ "$HOME\0" /* 2371 */ ".\0" /* 2373 */ ".ntprc\0" /* 2380 */ "https://bugs.ntp.org, bugs@ntp.org\0" /* 2415 */ "\n\0" -/* 2417 */ "ntp-keygen (ntp) 4.2.8p16"; +/* 2417 */ "ntp-keygen (ntp) 4.2.8p17"; /** * imbits option description: @@ -1314,7 +1314,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntp_keygenOptions.pzCopyright */ - puts(_("ntp-keygen (ntp) 4.2.8p16\n\ + puts(_("ntp-keygen (ntp) 4.2.8p17\n\ Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1413,14 +1413,14 @@ implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntp_keygenOptions.pzUsageTitle */ - puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p16\n\ + puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p17\n\ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n")); /* referenced via ntp_keygenOptions.pzExplain */ puts(_("\n")); /* referenced via ntp_keygenOptions.pzFullVersion */ - puts(_("ntp-keygen (ntp) 4.2.8p16")); + puts(_("ntp-keygen (ntp) 4.2.8p17")); /* referenced via ntp_keygenOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 8bbd22dcd932..9e266d2b164f 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h) * - * It has been AutoGen-ed May 31, 2023 at 08:03:00 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 6, 2023 at 04:38:23 AM by AutoGen 5.18.16 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -102,9 +102,9 @@ typedef enum { /** count of all options for ntp-keygen */ #define OPTION_CT 26 /** ntp-keygen version */ -#define NTP_KEYGEN_VERSION "4.2.8p16" +#define NTP_KEYGEN_VERSION "4.2.8p17" /** Full ntp-keygen version text */ -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) 4.2.8p16" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) 4.2.8p17" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman index 235e0b903d81..f96a7689b17c 100644 --- a/util/ntp-keygen.1ntp-keygenman +++ b/util/ntp-keygen.1ntp-keygenman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp-keygen 1ntp-keygenman "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH ntp-keygen 1ntp-keygenman "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:44:05 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:32 AM by AutoGen 5.18.16 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc index 87ef82e6bb62..ce6b988d7670 100644 --- a/util/ntp-keygen.1ntp-keygenmdoc +++ b/util/ntp-keygen.1ntp-keygenmdoc @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:44:01 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:27 AM by AutoGen 5.18.16 .\" From the definitions ntp-keygen-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/util/ntp-keygen.html b/util/ntp-keygen.html index 53aabf6c9fb1..0d16b09b5b46 100644 --- a/util/ntp-keygen.html +++ b/util/ntp-keygen.html @@ -84,7 +84,7 @@ All other files are in PEM-encoded printable ASCII format so they can be embedded as MIME attachments in mail to other sites. </p> -<p>This document applies to version 4.2.8p16 of <code>ntp-keygen</code>. +<p>This document applies to version 4.2.8p17 of <code>ntp-keygen</code>. </p> <table class="menu" border="0" cellspacing="0"> <tr><td align="left" valign="top">• <a href="#Description" accesskey="1">Description</a></td><td> </td><td align="left" valign="top"> @@ -1380,7 +1380,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p16 +<pre class="example">ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p17 Usage: ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]... Flg Arg Option-Name Description -b Num imbits identity modulus bits diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in index 5910410ed424..1495530155b6 100644 --- a/util/ntp-keygen.man.in +++ b/util/ntp-keygen.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp-keygen @NTP_KEYGEN_MS@ "31 May 2023" "ntp (4.2.8p16)" "User Commands" +.TH ntp-keygen @NTP_KEYGEN_MS@ "06 Jun 2023" "ntp (4.2.8p17)" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:44:05 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:32 AM by AutoGen 5.18.16 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in index 22a2e86f026b..44b1954cc648 100644 --- a/util/ntp-keygen.mdoc.in +++ b/util/ntp-keygen.mdoc.in @@ -1,9 +1,9 @@ -.Dd May 31 2023 +.Dd June 6 2023 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.mdoc) .\" -.\" It has been AutoGen-ed May 31, 2023 at 07:44:01 PM by AutoGen 5.18.16 +.\" It has been AutoGen-ed June 6, 2023 at 04:38:27 AM by AutoGen 5.18.16 .\" From the definitions ntp-keygen-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME |
