From: Harlan Stenn Date: Thu, 21 Dec 2017 08:34:52 +0000 (+0000) Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c42170501fe1b95479212775c59ba78af2bef653;p=thirdparty%2Fntp.git Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable into psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p11 bk: 5a3b722cJEW-aW2OTcdaG02LPkXJqQ --- c42170501fe1b95479212775c59ba78af2bef653 diff --cc ChangeLog index b1e84a899,f5244beeb..96dea87d2 --- a/ChangeLog +++ b/ChangeLog @@@ -1,8 -1,7 +1,10 @@@ --- +* [Sec 3414] ntpq: decodearr() can write beyond its 'buf' limits + - initial patch by , extended by +* [Sec 3412] ctl_getitem(): Don't compare names past NUL. + * [Bug 3447] AES-128-CMAC (fixes) + - refactoring the MAC code, too * [Bug 3441] Validate the assumption that AF_UNSPEC is 0. stenn@ntp.org * [Bug 3439] When running multiple commands / hosts in ntpq... - applied patch by ggarvey @@@ -50,8 -52,12 +55,13 @@@ * test_ntp_scanner_LDADD needs ntpd/ntp_io.o. HStenn. * refclock_jjy.c: Add missing "%s" to an msyslog() call. HStenn. * Build ntpq and libntpq.a with NTP_HARD_*FLAGS. perlinger@ntp.org +* Fix trivial warnings from 'make check'. perlinger@ntp.org * Fix bug in the override portion of the compiler hardening macro. HStenn. + * record_raw_stats(): Log entire packet. Log writes. HStenn. + * AES-128-CMAC support. BInglis, HStenn, JPerlinger. + * sntp: tweak key file logging. HStenn. + * sntp: pkt_output(): Improve debug output. HStenn. + * update-leap: updates from Paul McMath. --- (4.2.8p10) 2017/03/21 Released by Harlan Stenn diff --cc tests/ntpd/run-leapsec.c index 30fffdecc,10c8c5f78..16b4c3fda --- a/tests/ntpd/run-leapsec.c +++ b/tests/ntpd/run-leapsec.c @@@ -84,40 -90,41 +91,41 @@@ char const *progname int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("leapsec.c"); - RUN_TEST(test_ValidateGood, 351); - RUN_TEST(test_ValidateNoHash, 362); - RUN_TEST(test_ValidateBad, 373); - RUN_TEST(test_ValidateMalformed, 385); - RUN_TEST(test_ValidateMalformedShort, 397); - RUN_TEST(test_ValidateNoLeadZero, 409); - RUN_TEST(test_tableSelect, 426); - RUN_TEST(test_loadFileExpire, 466); - RUN_TEST(test_loadFileTTL, 487); - RUN_TEST(test_lsQueryPristineState, 522); - RUN_TEST(test_ls2009faraway, 538); - RUN_TEST(test_ls2009weekaway, 559); - RUN_TEST(test_ls2009houraway, 580); - RUN_TEST(test_ls2009secaway, 601); - RUN_TEST(test_ls2009onspot, 622); - RUN_TEST(test_ls2009nodata, 643); - RUN_TEST(test_ls2009limdata, 664); - RUN_TEST(test_qryJumpFarAhead, 689); - RUN_TEST(test_qryJumpAheadToTransition, 712); - RUN_TEST(test_qryJumpAheadOverTransition, 737); - RUN_TEST(test_addDynamic, 767); - RUN_TEST(test_taiEmptyTable, 961); - RUN_TEST(test_taiTableFixed, 974); - RUN_TEST(test_taiTableDynamic, 990); - RUN_TEST(test_taiTableDynamicDeadZone, 1020); - RUN_TEST(test_ls2009seqInsElectric, 1044); - RUN_TEST(test_ls2009seqInsDumb, 1091); - RUN_TEST(test_ls2009seqDelElectric, 1143); - RUN_TEST(test_ls2009seqDelDumb, 1190); - RUN_TEST(test_ls2012seqInsElectric, 1236); - RUN_TEST(test_ls2012seqInsDumb, 1283); - RUN_TEST(test_lsEmptyTableDumb, 1336); - RUN_TEST(test_lsEmptyTableElectric, 1365); + RUN_TEST(test_ValidateGood, 329); + RUN_TEST(test_ValidateNoHash, 339); + RUN_TEST(test_ValidateBad, 349); + RUN_TEST(test_ValidateMalformed, 359); + RUN_TEST(test_ValidateMalformedShort, 369); + RUN_TEST(test_ValidateNoLeadZero, 379); + RUN_TEST(test_tableSelect, 394); + RUN_TEST(test_loadFileExpire, 431); + RUN_TEST(test_loadFileTTL, 449); + RUN_TEST(test_lsQueryPristineState, 482); + RUN_TEST(test_ls2009faraway, 496); + RUN_TEST(test_ls2009weekaway, 515); + RUN_TEST(test_ls2009houraway, 534); + RUN_TEST(test_ls2009secaway, 553); + RUN_TEST(test_ls2009onspot, 572); + RUN_TEST(test_ls2009nodata, 591); + RUN_TEST(test_ls2009limdata, 610); + RUN_TEST(test_qryJumpFarAhead, 633); + RUN_TEST(test_qryJumpAheadToTransition, 656); + RUN_TEST(test_qryJumpAheadOverTransition, 679); + RUN_TEST(test_addDynamic, 706); + RUN_TEST(test_taiEmptyTable, 892); + RUN_TEST(test_taiTableFixed, 906); + RUN_TEST(test_taiTableDynamic, 920); + RUN_TEST(test_taiTableDynamicDeadZone, 948); + RUN_TEST(test_ls2009seqInsElectric, 970); + RUN_TEST(test_ls2009seqInsDumb, 1015); + RUN_TEST(test_ls2009seqDelElectric, 1064); + RUN_TEST(test_ls2009seqDelDumb, 1109); + RUN_TEST(test_ls2012seqInsElectric, 1153); + RUN_TEST(test_ls2012seqInsDumb, 1198); + RUN_TEST(test_lsEmptyTableDumb, 1249); + RUN_TEST(test_lsEmptyTableElectric, 1272); return (UnityEnd()); } diff --cc tests/ntpd/run-ntp_prio_q.c index 10dab41c3,82bec261c..5b1adea4a --- a/tests/ntpd/run-ntp_prio_q.c +++ b/tests/ntpd/run-ntp_prio_q.c @@@ -56,14 -63,15 +63,15 @@@ char const *progname int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("ntp_prio_q.c"); - RUN_TEST(test_AllocateDeallocateNode, 39); + RUN_TEST(test_AllocateDeallocateNode, 38); RUN_TEST(test_EmptyQueue, 46); - RUN_TEST(test_OneElementQueue, 60); - RUN_TEST(test_MultipleElementQueue, 88); - RUN_TEST(test_CustomOrderQueue, 126); - RUN_TEST(test_DestroyNonEmptyQueue, 183); - RUN_TEST(test_AppendQueues, 205); + RUN_TEST(test_OneElementQueue, 61); + RUN_TEST(test_MultipleElementQueue, 90); + RUN_TEST(test_CustomOrderQueue, 129); + RUN_TEST(test_DestroyNonEmptyQueue, 187); + RUN_TEST(test_AppendQueues, 211); return (UnityEnd()); } diff --cc tests/ntpd/run-ntp_restrict.c index b973fa180,9cf14533a..6013bbf74 --- a/tests/ntpd/run-ntp_restrict.c +++ b/tests/ntpd/run-ntp_restrict.c @@@ -54,15 -61,16 +61,16 @@@ char const *progname int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("ntp_restrict.c"); - RUN_TEST(test_RestrictionsAreEmptyAfterInit, 60); - RUN_TEST(test_ReturnsCorrectDefaultRestrictions, 86); - RUN_TEST(test_HackingDefaultRestriction, 97); - RUN_TEST(test_CantRemoveDefaultEntry, 120); - RUN_TEST(test_AddingNewRestriction, 131); - RUN_TEST(test_TheMostFittingRestrictionIsMatched, 144); - RUN_TEST(test_DeletedRestrictionIsNotMatched, 166); - RUN_TEST(test_RestrictUnflagWorks, 190); + RUN_TEST(test_RestrictionsAreEmptyAfterInit, 63); + RUN_TEST(test_ReturnsCorrectDefaultRestrictions, 90); + RUN_TEST(test_HackingDefaultRestriction, 102); + RUN_TEST(test_CantRemoveDefaultEntry, 126); + RUN_TEST(test_AddingNewRestriction, 138); + RUN_TEST(test_TheMostFittingRestrictionIsMatched, 152); + RUN_TEST(test_DeletedRestrictionIsNotMatched, 175); + RUN_TEST(test_RestrictUnflagWorks, 200); return (UnityEnd()); } diff --cc tests/ntpd/run-rc_cmdlength.c index 6e332e593,684470ce9..e5121cd1d --- a/tests/ntpd/run-rc_cmdlength.c +++ b/tests/ntpd/run-rc_cmdlength.c @@@ -51,8 -58,9 +58,9 @@@ char const *progname int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("rc_cmdlength.c"); - RUN_TEST(test_EvaluateCommandLength, 16); + RUN_TEST(test_EvaluateCommandLength, 14); return (UnityEnd()); } diff --cc tests/ntpd/run-t-ntp_scanner.c index 2b250b0f7,9bed5cfb9..056bb5bc6 --- a/tests/ntpd/run-t-ntp_scanner.c +++ b/tests/ntpd/run-t-ntp_scanner.c @@@ -55,18 -62,19 +62,19 @@@ char const *progname int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("t-ntp_scanner.c"); - RUN_TEST(test_keywordIncorrectToken, 21); - RUN_TEST(test_keywordServerToken, 22); - RUN_TEST(test_DropUninitializedStack, 23); - RUN_TEST(test_IncorrectlyInitializeLexStack, 24); - RUN_TEST(test_InitializeLexStack, 25); - RUN_TEST(test_PopEmptyStack, 61); - RUN_TEST(test_IsInteger, 69); - RUN_TEST(test_IsUint, 87); - RUN_TEST(test_IsDouble, 99); - RUN_TEST(test_SpecialSymbols, 111); - RUN_TEST(test_EOC, 120); + RUN_TEST(test_keywordIncorrectToken, 8); + RUN_TEST(test_keywordServerToken, 16); + RUN_TEST(test_DropUninitializedStack, 24); + RUN_TEST(test_IncorrectlyInitializeLexStack, 30); + RUN_TEST(test_InitializeLexStack, 38); + RUN_TEST(test_PopEmptyStack, 49); + RUN_TEST(test_IsInteger, 57); + RUN_TEST(test_IsUint, 76); + RUN_TEST(test_IsDouble, 90); + RUN_TEST(test_SpecialSymbols, 104); + RUN_TEST(test_EOC, 115); return (UnityEnd()); }