diff options
author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
commit | c62812877398840dae0ba74b03e9e6a43cc56fc5 (patch) | |
tree | 304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/tests/sec-2853 | |
parent | 9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff) | |
download | FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/tests/sec-2853')
-rw-r--r-- | contrib/ntp/tests/sec-2853/Makefile.am | 2 | ||||
-rw-r--r-- | contrib/ntp/tests/sec-2853/Makefile.in | 8 | ||||
-rw-r--r-- | contrib/ntp/tests/sec-2853/run-sec-2853.c | 13 | ||||
-rw-r--r-- | contrib/ntp/tests/sec-2853/sec-2853.c | 4 |
4 files changed, 16 insertions, 11 deletions
diff --git a/contrib/ntp/tests/sec-2853/Makefile.am b/contrib/ntp/tests/sec-2853/Makefile.am index 417ff6b..59734da 100644 --- a/contrib/ntp/tests/sec-2853/Makefile.am +++ b/contrib/ntp/tests/sec-2853/Makefile.am @@ -27,6 +27,8 @@ AM_CPPFLAGS = $(NTP_INCS) AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity AM_CPPFLAGS += -I$(top_srcdir)/include AM_CPPFLAGS += $(CPPFLAGS_NTP) +AM_CPPFLAGS += -DUNITY_INCLUDE_CONFIG_H +AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity AM_LDFLAGS = $(LDFLAGS_NTP) diff --git a/contrib/ntp/tests/sec-2853/Makefile.in b/contrib/ntp/tests/sec-2853/Makefile.in index 4336e59..3f581c7 100644 --- a/contrib/ntp/tests/sec-2853/Makefile.in +++ b/contrib/ntp/tests/sec-2853/Makefile.in @@ -117,6 +117,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_locinfo.m4 \ $(top_srcdir)/sntp/m4/ntp_openssl.m4 \ $(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \ + $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ @@ -429,6 +430,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_THREAD = @BUILD_THREAD@ CALC_TICKADJ_DB = @CALC_TICKADJ_DB@ CALC_TICKADJ_DL = @CALC_TICKADJ_DL@ CALC_TICKADJ_DS = @CALC_TICKADJ_DS@ @@ -437,6 +439,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@ CFLAGS_NTP = @CFLAGS_NTP@ CHUTEST = @CHUTEST@ CONFIG_SHELL = @CONFIG_SHELL@ @@ -498,8 +501,8 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIPO = @LIPO@ LN_S = @LN_S@ LSCF = @LSCF@ +LTHREAD_LIBS = @LTHREAD_LIBS@ LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MAKE_ADJTIMED = @MAKE_ADJTIMED@ MAKE_CHECK_LAYOUT = @MAKE_CHECK_LAYOUT@ @@ -709,7 +712,8 @@ AM_CFLAGS = $(CFLAGS_NTP) # HMS: we may not need some of these: AM_CPPFLAGS = $(NTP_INCS) -I$(top_srcdir)/sntp/unity \ - -I$(top_srcdir)/include $(CPPFLAGS_NTP) + -I$(top_srcdir)/include $(CPPFLAGS_NTP) \ + -DUNITY_INCLUDE_CONFIG_H -I$(top_srcdir)/sntp/unity AM_LDFLAGS = $(LDFLAGS_NTP) sec_2853_SOURCES = \ run-sec-2853.c \ diff --git a/contrib/ntp/tests/sec-2853/run-sec-2853.c b/contrib/ntp/tests/sec-2853/run-sec-2853.c index c8771bf..1159a77 100644 --- a/contrib/ntp/tests/sec-2853/run-sec-2853.c +++ b/contrib/ntp/tests/sec-2853/run-sec-2853.c @@ -22,33 +22,32 @@ #include "unity.h" #include <setjmp.h> #include <stdio.h> +#include <config.h> +#include <rc_cmdlength.h> //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -void resetTest(void); -extern void test_main(void ); extern void test_main(void ); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "sec-2853.c"; UnityBegin("sec-2853.c"); - RUN_TEST(test_main, 8); - RUN_TEST(test_main, 8); + RUN_TEST(test_main, 10); return (UnityEnd()); } diff --git a/contrib/ntp/tests/sec-2853/sec-2853.c b/contrib/ntp/tests/sec-2853/sec-2853.c index 6499fdf..49589d2 100644 --- a/contrib/ntp/tests/sec-2853/sec-2853.c +++ b/contrib/ntp/tests/sec-2853/sec-2853.c @@ -1,5 +1,7 @@ #include <config.h> +#include <rc_cmdlength.h> + #include "unity.h" void setUp(void); @@ -10,8 +12,6 @@ int basic_good( void ); int embedded_nul( void ); int trailing_space( void ); -extern size_t remoteconfig_cmdlength(const char *, const char *); - static int verbose = 1; // if not 0, also print results if test passed static int exit_on_err = 0; // if not 0, exit if test failed |