vendor/ntp/4.2.8p18vendor/ntp

31 files changed, 432 insertions, 472 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8fc216f44bf0..bf690ee25716 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -383,6 +383,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
+PATH_OPENSSL = @PATH_OPENSSL@
 PATH_PERL = @PATH_PERL@
 PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
diff --git a/tests/bug-2803/Makefile.in b/tests/bug-2803/Makefile.in
index ea7a60b41017..61d426a60594 100644
--- a/tests/bug-2803/Makefile.in
+++ b/tests/bug-2803/Makefile.in
@@ -89,6 +89,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = bug-2803$(EXEEXT)
 @NTP_CROSSCOMPILE_FALSE@am__append_1 = $(check_PROGRAMS)
+@LIBNTP_SUBMAKES_TRUE@am__append_2 = check-libntp
 subdir = tests/bug-2803
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -592,6 +593,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
+PATH_OPENSSL = @PATH_OPENSSL@
 PATH_PERL = @PATH_PERL@
 PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
@@ -691,8 +693,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
-BUILT_SOURCES = check-libntp check-libunity .deps-ver
-CLEANFILES = check-libntp .deps-ver
+BUILT_SOURCES = $(am__append_2) check-libunity .deps-ver
+CLEANFILES = check-libunity .deps-ver
 DISTCLEANFILES = $(DEPDIR)/deps-ver
 std_unity_list = \
 	$(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
@@ -1219,14 +1221,13 @@ uninstall-am:
 $(srcdir)/run-bug-2803.c: $(srcdir)/bug-2803.c $(std_unity_list)
 	$(run_unity) $< $@
 
-check-libntp: $(top_builddir)/libntp/libntp.a
-	@: avoid default SCCS get by some make implementations
+.PHONY: check-libntp
 
-$(top_builddir)/libntp/libntp.a:
-	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+@LIBNTP_SUBMAKES_TRUE@check-libntp:
+@LIBNTP_SUBMAKES_TRUE@	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
 check-libunity: $(top_builddir)/sntp/unity/libunity.a
-	 @: avoid default SCCS get by some make implementations
+	@echo stamp > $@
 
 $(top_builddir)/sntp/unity/libunity.a:
 	cd $(top_builddir)/sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
diff --git a/tests/bug-2803/bug-2803.c b/tests/bug-2803/bug-2803.c
index df9dcdec7774..ba761c43035b 100644
--- a/tests/bug-2803/bug-2803.c
+++ b/tests/bug-2803/bug-2803.c
@@ -7,7 +7,6 @@
 #include <timevalops.h>
 
 #include "unity.h"
-//#include "bug-2803.h"
 
 /* microseconds per second */
 #define MICROSECONDS 1000000
@@ -53,10 +52,10 @@ static int do_test( struct timeval timetv, struct timeval tvlast )
 
 	if ( failed || verbose )
 		printf( "timetv %lli|%07li, tvlast  %lli|%07li: tvdiff_old: %lli|%07li -> %i, tvdiff_new: %lli|%07li -> %i, same cond: %s\n",
-			(long long) timetv.tv_sec, timetv.tv_usec,
-			(long long) tvlast.tv_sec, tvlast.tv_usec,
-			(long long) tvdiff_old.tv_sec, tvdiff_old.tv_usec, cond_old,
-			(long long) tvdiff_new.tv_sec, tvdiff_new.tv_usec, cond_new,
+			(long long) timetv.tv_sec, (u_long)timetv.tv_usec,
+			(long long) tvlast.tv_sec, (u_long)tvlast.tv_usec,
+			(long long) tvdiff_old.tv_sec, (u_long)tvdiff_old.tv_usec, cond_old,
+			(long long) tvdiff_new.tv_sec, (u_long)tvdiff_new.tv_usec, cond_new,
 			failed ? "NO <<" : "yes" );
 
 	return failed ? -1 : 0;
diff --git a/tests/bug-2803/run-bug-2803.c b/tests/bug-2803/run-bug-2803.c
index 0cc2e5f68429..41c976a5d256 100644
--- a/tests/bug-2803/run-bug-2803.c
+++ b/tests/bug-2803/run-bug-2803.c
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
   progname = argv[0];
   suite_setup();
   UnityBegin("bug-2803.c");
-  RUN_TEST(test_main, 18);
+  RUN_TEST(test_main, 17);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am
index def10b301c73..e813a424119f 100644
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@ -45,7 +45,6 @@ check_PROGRAMS =		\
 	test-msyslog		\
 	test-netof		\
 	test-numtoa		\
-	test-numtohost		\
 	test-octtoint		\
 	test-prettydate		\
 	test-realpath		\
@@ -112,7 +111,6 @@ BUILT_SOURCES +=			\
 	$(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	\
@@ -382,16 +380,6 @@ $(srcdir)/run-numtoa.c: $(srcdir)/numtoa.c $(std_unity_list)
 
 ###
 
-test_numtohost_SOURCES =	\
-	numtohost.c		\
-	run-numtohost.c		\
-	$(NULL)
-
-$(srcdir)/run-numtohost.c: $(srcdir)/numtohost.c $(std_unity_list)
-	$(run_unity) $< $@
-
-###
-
 test_octtoint_SOURCES =		\
 	octtoint.c		\
 	run-octtoint.c		\
diff --git a/tests/libntp/Makefile.in b/tests/libntp/Makefile.in
index c982df256def..7dca29d591e5 100644
--- a/tests/libntp/Makefile.in
+++ b/tests/libntp/Makefile.in
@@ -98,18 +98,18 @@ check_PROGRAMS = test-a_md5encrypt$(EXEEXT) test-atoint$(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) \
-	test-refnumtoa$(EXEEXT) test-sbprintf$(EXEEXT) \
-	test-sfptostr$(EXEEXT) test-socktoa$(EXEEXT) \
-	test-ssl_init$(EXEEXT) test-statestr$(EXEEXT) \
-	test-strtolfp$(EXEEXT) test-timespecops$(EXEEXT) \
-	test-timevalops$(EXEEXT) test-tsafememcmp$(EXEEXT) \
-	test-tstotv$(EXEEXT) test-tvtots$(EXEEXT) \
-	test-uglydate$(EXEEXT) test-vi64ops$(EXEEXT) \
-	test-ymd2yd$(EXEEXT) $(am__EXEEXT_1)
+	test-octtoint$(EXEEXT) test-prettydate$(EXEEXT) \
+	test-realpath$(EXEEXT) test-recvbuff$(EXEEXT) \
+	test-refidsmear$(EXEEXT) test-refnumtoa$(EXEEXT) \
+	test-sbprintf$(EXEEXT) test-sfptostr$(EXEEXT) \
+	test-socktoa$(EXEEXT) test-ssl_init$(EXEEXT) \
+	test-statestr$(EXEEXT) test-strtolfp$(EXEEXT) \
+	test-timespecops$(EXEEXT) test-timevalops$(EXEEXT) \
+	test-tsafememcmp$(EXEEXT) test-tstotv$(EXEEXT) \
+	test-tvtots$(EXEEXT) test-uglydate$(EXEEXT) \
+	test-vi64ops$(EXEEXT) test-ymd2yd$(EXEEXT) $(am__EXEEXT_1)
 @NTP_CROSSCOMPILE_FALSE@am__append_1 = $(check_PROGRAMS)
+@LIBNTP_SUBMAKES_TRUE@am__append_2 = check-libntp
 subdir = tests/libntp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -355,14 +355,6 @@ test_numtoa_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_numtohost_OBJECTS = numtohost.$(OBJEXT) \
-	run-numtohost.$(OBJEXT) $(am__objects_1)
-test_numtohost_OBJECTS = $(am_test_numtohost_OBJECTS)
-test_numtohost_LDADD = $(LDADD)
-test_numtohost_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_octtoint_OBJECTS = octtoint.$(OBJEXT) run-octtoint.$(OBJEXT) \
 	$(am__objects_1)
 test_octtoint_OBJECTS = $(am_test_octtoint_OBJECTS)
@@ -552,19 +544,18 @@ am__depfiles_remade = ./$(DEPDIR)/a_md5encrypt.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 \
-	./$(DEPDIR)/run-msyslog.Po ./$(DEPDIR)/run-netof.Po \
-	./$(DEPDIR)/run-numtoa.Po ./$(DEPDIR)/run-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 ./$(DEPDIR)/run-msyslog.Po \
+	./$(DEPDIR)/run-netof.Po ./$(DEPDIR)/run-numtoa.Po \
 	./$(DEPDIR)/run-octtoint.Po ./$(DEPDIR)/run-prettydate.Po \
 	./$(DEPDIR)/run-realpath.Po ./$(DEPDIR)/run-recvbuff.Po \
 	./$(DEPDIR)/run-refidsmear.Po ./$(DEPDIR)/run-refnumtoa.Po \
@@ -624,28 +615,6 @@ SOURCES = $(test_a_md5encrypt_SOURCES) $(test_atoint_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)
-DIST_SOURCES = $(test_a_md5encrypt_SOURCES) $(test_atoint_SOURCES) \
-	$(test_atouint_SOURCES) $(test_authkeys_SOURCES) \
-	$(test_buftvtots_SOURCES) $(test_calendar_SOURCES) \
-	$(test_caljulian_SOURCES) $(test_caltontp_SOURCES) \
-	$(test_calyearstart_SOURCES) $(test_clocktime_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) \
@@ -656,6 +625,27 @@ DIST_SOURCES = $(test_a_md5encrypt_SOURCES) $(test_atoint_SOURCES) \
 	$(test_tsafememcmp_SOURCES) $(test_tstotv_SOURCES) \
 	$(test_tvtots_SOURCES) $(test_uglydate_SOURCES) \
 	$(test_vi64ops_SOURCES) $(test_ymd2yd_SOURCES)
+DIST_SOURCES = $(test_a_md5encrypt_SOURCES) $(test_atoint_SOURCES) \
+	$(test_atouint_SOURCES) $(test_authkeys_SOURCES) \
+	$(test_buftvtots_SOURCES) $(test_calendar_SOURCES) \
+	$(test_caljulian_SOURCES) $(test_caltontp_SOURCES) \
+	$(test_calyearstart_SOURCES) $(test_clocktime_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_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;; \
@@ -1059,6 +1049,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
+PATH_OPENSSL = @PATH_OPENSSL@
 PATH_PERL = @PATH_PERL@
 PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
@@ -1168,19 +1159,19 @@ BUILT_SOURCES = $(srcdir)/run-a_md5encrypt.c $(srcdir)/run-atoint.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
+	$(srcdir)/run-numtoa.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) $(am__append_2) check-libunity \
+	.deps-ver
+CLEANFILES = srcdir.c check-libunity .deps-ver
 DISTCLEANFILES = $(DEPDIR)/deps-ver
 std_unity_list = \
 	$(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
@@ -1394,13 +1385,6 @@ test_numtoa_SOURCES = \
 
 
 ###
-test_numtohost_SOURCES = \
-	numtohost.c		\
-	run-numtohost.c		\
-	$(NULL)
-
-
-###
 test_octtoint_SOURCES = \
 	octtoint.c		\
 	run-octtoint.c		\
@@ -1683,10 +1667,6 @@ test-numtoa$(EXEEXT): $(test_numtoa_OBJECTS) $(test_numtoa_DEPENDENCIES) $(EXTRA
 	@rm -f test-numtoa$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_numtoa_OBJECTS) $(test_numtoa_LDADD) $(LIBS)
 
-test-numtohost$(EXEEXT): $(test_numtohost_OBJECTS) $(test_numtohost_DEPENDENCIES) $(EXTRA_test_numtohost_DEPENDENCIES) 
-	@rm -f test-numtohost$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_numtohost_OBJECTS) $(test_numtohost_LDADD) $(LIBS)
-
 test-octtoint$(EXEEXT): $(test_octtoint_OBJECTS) $(test_octtoint_DEPENDENCIES) $(EXTRA_test_octtoint_DEPENDENCIES) 
 	@rm -f test-octtoint$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_octtoint_OBJECTS) $(test_octtoint_LDADD) $(LIBS)
@@ -1792,7 +1772,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msyslog.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netof.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numtoa.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numtohost.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/octtoint.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prettydate.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/realpath.Po@am__quote@ # am--include-marker
@@ -1817,7 +1796,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-msyslog.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-netof.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-numtoa.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-numtohost.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-octtoint.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-prettydate.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-realpath.Po@am__quote@ # am--include-marker
@@ -2395,13 +2373,6 @@ test-numtoa.log: test-numtoa$(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-numtohost.log: test-numtohost$(EXEEXT)
-	@p='test-numtohost$(EXEEXT)'; \
-	b='test-numtohost'; \
-	$(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-octtoint.log: test-octtoint$(EXEEXT)
 	@p='test-octtoint$(EXEEXT)'; \
 	b='test-octtoint'; \
@@ -2659,7 +2630,6 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/msyslog.Po
 	-rm -f ./$(DEPDIR)/netof.Po
 	-rm -f ./$(DEPDIR)/numtoa.Po
-	-rm -f ./$(DEPDIR)/numtohost.Po
 	-rm -f ./$(DEPDIR)/octtoint.Po
 	-rm -f ./$(DEPDIR)/prettydate.Po
 	-rm -f ./$(DEPDIR)/realpath.Po
@@ -2684,7 +2654,6 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/run-msyslog.Po
 	-rm -f ./$(DEPDIR)/run-netof.Po
 	-rm -f ./$(DEPDIR)/run-numtoa.Po
-	-rm -f ./$(DEPDIR)/run-numtohost.Po
 	-rm -f ./$(DEPDIR)/run-octtoint.Po
 	-rm -f ./$(DEPDIR)/run-prettydate.Po
 	-rm -f ./$(DEPDIR)/run-realpath.Po
@@ -2795,7 +2764,6 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/msyslog.Po
 	-rm -f ./$(DEPDIR)/netof.Po
 	-rm -f ./$(DEPDIR)/numtoa.Po
-	-rm -f ./$(DEPDIR)/numtohost.Po
 	-rm -f ./$(DEPDIR)/octtoint.Po
 	-rm -f ./$(DEPDIR)/prettydate.Po
 	-rm -f ./$(DEPDIR)/realpath.Po
@@ -2820,7 +2788,6 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/run-msyslog.Po
 	-rm -f ./$(DEPDIR)/run-netof.Po
 	-rm -f ./$(DEPDIR)/run-numtoa.Po
-	-rm -f ./$(DEPDIR)/run-numtohost.Po
 	-rm -f ./$(DEPDIR)/run-octtoint.Po
 	-rm -f ./$(DEPDIR)/run-prettydate.Po
 	-rm -f ./$(DEPDIR)/run-realpath.Po
@@ -2971,9 +2938,6 @@ $(srcdir)/run-netof.c: $(srcdir)/netof.c $(std_unity_list)
 $(srcdir)/run-numtoa.c: $(srcdir)/numtoa.c $(std_unity_list)
 	$(run_unity) $< $@
 
-$(srcdir)/run-numtohost.c: $(srcdir)/numtohost.c $(std_unity_list)
-	$(run_unity) $< $@
-
 $(srcdir)/run-octtoint.c: $(srcdir)/octtoint.c $(std_unity_list)
 	$(run_unity) $< $@
 
@@ -3034,14 +2998,13 @@ $(srcdir)/run-vi64ops.c: $(srcdir)/vi64ops.c $(std_unity_list)
 $(srcdir)/run-ymd2yd.c: $(srcdir)/ymd2yd.c $(std_unity_list)
 	$(run_unity) $< $@
 
-check-libntp: $(top_builddir)/libntp/libntp.a
-	@: avoid default SCCS get by some make implementations
+.PHONY: check-libntp
 
-$(top_builddir)/libntp/libntp.a:
-	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+@LIBNTP_SUBMAKES_TRUE@check-libntp:
+@LIBNTP_SUBMAKES_TRUE@	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
 check-libunity: $(top_builddir)/sntp/unity/libunity.a
-	 @: avoid default SCCS get by some make implementations
+	@echo stamp > $@
 
 $(top_builddir)/sntp/unity/libunity.a:
 	cd $(top_builddir)/sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
diff --git a/tests/libntp/a_md5encrypt.c b/tests/libntp/a_md5encrypt.c
index 212ec8313973..dc722e0643c7 100644
--- a/tests/libntp/a_md5encrypt.c
+++ b/tests/libntp/a_md5encrypt.c
@@ -9,34 +9,56 @@
 #include "ntp.h"
 #include "ntp_stdlib.h"
 
-u_long current_time = 4;
-
 
 /*
- * Example packet with MD5 hash calculated manually.
+ * Example packet with SHA1 hash calculated manually:
+ * echo -n abcdefghijklmnopqrstuvwx | openssl sha1 -
  */
-const int keytype = KEY_TYPE_MD5;
-const u_char *key = (const u_char*)"abcdefgh";
-const u_short keyLength = 8;
-const u_char *packet = (const u_char*)"ijklmnopqrstuvwx";
-#define packetLength 16
-#define keyIdLength  4
-#define digestLength 16
-#define totalLength (packetLength + keyIdLength + digestLength)
+#ifdef OPENSSL
+const keyid_t keyId = 42;
+const int keytype = NID_sha1;
+const u_char key[] = "abcdefgh";
+const size_t keyLength = sizeof(key) - 1;
+const u_char payload[] = "ijklmnopqrstuvwx";
+#define payloadLength (sizeof(payload) - 1)
+#define keyIdLength  (sizeof(keyid_t))
+#define digestLength SHA1_LENGTH
+#define packetLength (payloadLength + keyIdLength + digestLength)
 union {
-	u_char		u8 [totalLength];
+	u_char		u8 [packetLength];
 	uint32_t	u32[1];
-} expectedPacket = {
-	"ijklmnopqrstuvwx\0\0\0\0\x0c\x0e\x84\xcf\x0b\xb7\xa8\x68\x8e\x52\x38\xdb\xbc\x1c\x39\x53"
+} expectedPacket =
+{
+    {
+	'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+	'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
+	0x00, 0x00, 0x00, 0x00,
+	0xd7, 0x17, 0xe2, 0x2e,
+	0x16, 0x59, 0x30, 0x5f,
+	0xad, 0x6e, 0xf0, 0x88,
+	0x64, 0x92, 0x3d, 0xb6,
+	0x4a, 0xba, 0x9c, 0x08
+    }
 };
 union {
-	u_char		u8 [totalLength];
+	u_char		u8 [packetLength];
 	uint32_t	u32[1];
-} invalidPacket = {
-	"ijklmnopqrstuvwx\0\0\0\0\x0c\x0e\x84\xcf\x0b\xb7\xa8\x68\x8e\x52\x38\xdb\xbc\x1c\x39\x54"
-};
+} invalidPacket =
+{
+    {
+	'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+	'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
+	0x00, 0x00, 0x00, 0x00,
+	0xd7, 0x17, 0xe2, 0x2e,
+	0x16, 0x59, 0x30, 0x5f,
+	0xad, 0x6e, 0xf0, 0x88,
+	0x64, 0x92, 0x3d, 0xb6,
+	0x4a, 0xba, 0x9c, 0xff
+    }
+}; /* same as expectedPacket but with last octet modified */
+#endif	/* OPENSSL */
 
-static const keyid_t keyId = 42;
+u_long current_time = 4;
 
 void test_Encrypt(void);
 void test_DecryptValid(void);
@@ -46,45 +68,66 @@ void test_IPv6AddressToRefId(void);
 
 
 void
-test_Encrypt(void) {
+test_Encrypt(void)
+{
+#ifndef OPENSSL
+	TEST_IGNORE_MESSAGE("non-SSL build");
+#else
 	u_int32 *packetPtr;
-	int length;
+	size_t length;
 
-	packetPtr = emalloc_zero(totalLength * sizeof(*packetPtr));
-	memcpy(packetPtr, packet, packetLength);
+	packetPtr = emalloc_zero(packetLength);
+	memcpy(packetPtr, payload, payloadLength);
 
-	length = MD5authencrypt(keytype, key, keyLength, packetPtr, packetLength);
+	length = MD5authencrypt(keytype, key, keyLength,
+				packetPtr, payloadLength);
 
-	TEST_ASSERT_TRUE(MD5authdecrypt(keytype, key, keyLength, packetPtr, packetLength, length, keyId));
+	TEST_ASSERT_EQUAL(MAX_SHA1_LEN, length);
 
-	TEST_ASSERT_EQUAL(20, length);
-	TEST_ASSERT_EQUAL_MEMORY(expectedPacket.u8, packetPtr, totalLength);
+	TEST_ASSERT_TRUE(MD5authdecrypt(keytype, key, keyLength, packetPtr,
+				        payloadLength, MAX_SHA1_LEN, keyId));
+	TEST_ASSERT_EQUAL_MEMORY(expectedPacket.u8, packetPtr, packetLength);
 
 	free(packetPtr);
+#endif	/* OPENSSL */
 }
 
 void
-test_DecryptValid(void) {
-	TEST_ASSERT_TRUE(MD5authdecrypt(keytype, key, keyLength, expectedPacket.u32, packetLength, 20, keyId));
+test_DecryptValid(void)
+{
+#ifndef OPENSSL
+	TEST_IGNORE_MESSAGE("non-SSL build");
+#else
+	TEST_ASSERT_TRUE(MD5authdecrypt(keytype, key, keyLength,
+					expectedPacket.u32, payloadLength,
+					MAX_SHA1_LEN, keyId));
+#endif	/* OPENSSL */
 }
 
 void
-test_DecryptInvalid(void) {
-	TEST_ASSERT_FALSE(MD5authdecrypt(keytype, key, keyLength, invalidPacket.u32, packetLength, 20, keyId));
+test_DecryptInvalid(void)
+{
+#ifndef OPENSSL
+	TEST_IGNORE_MESSAGE("non-SSL build");
+#else
+	TEST_ASSERT_FALSE(MD5authdecrypt(keytype, key, keyLength,
+					 invalidPacket.u32, payloadLength,
+					 MAX_SHA1_LEN, keyId));
+#endif	/* OPENSSL */
 }
 
 void
-test_IPv4AddressToRefId(void) {
-	sockaddr_u addr;
-	addr.sa4.sin_family = AF_INET;
-	u_int32 address;
+test_IPv4AddressToRefId(void)
+{
+	sockaddr_u	addr;
+	u_int32		addr4n;
 
-	addr.sa4.sin_port = htons(80);
+	AF(&addr) = AF_INET;
+	SET_PORT(&addr, htons(80));
+	addr4n = inet_addr("192.0.2.1");
+	NSRCADR(&addr) = addr4n;
 
-	address = inet_addr("192.0.2.1");
-	addr.sa4.sin_addr.s_addr = address;
-
-	TEST_ASSERT_EQUAL(address, addr2refid(&addr));
+	TEST_ASSERT_EQUAL_UINT32(addr4n, addr2refid(&addr));
 }
 
 void
@@ -98,15 +141,8 @@ test_IPv6AddressToRefId(void) {
 	} } };
 	sockaddr_u addr;
 
-	addr.sa6.sin6_family = AF_INET6;
-
-	addr.sa6.sin6_addr = address;
+	AF(&addr) = AF_INET6;
+	SOCK_ADDR6(&addr) = address;
 
-
-#if 0
 	TEST_ASSERT_EQUAL(expected, addr2refid(&addr));
-#else
-	(void)expected;
-	TEST_IGNORE_MESSAGE("Skipping because of big endian problem?");
-#endif
 }
diff --git a/tests/libntp/calendar.c b/tests/libntp/calendar.c
index ea24b3ddd214..f7d4bee7d6ee 100644
--- a/tests/libntp/calendar.c
+++ b/tests/libntp/calendar.c
@@ -1015,7 +1015,7 @@ test_CalIMod7(void)
  */
 
 void
-test_RellezCentury1_1()
+test_RellezCentury1_1(void)
 {
 	/* 1st day of a century */
 	TEST_ASSERT_EQUAL(1901, ntpcal_expand_century( 1, 1, 1, CAL_TUESDAY  ));
@@ -1029,7 +1029,7 @@ test_RellezCentury1_1()
 }
 
 void
-test_RellezCentury3_1()
+test_RellezCentury3_1(void)
 {
 	/* 1st day in March of a century (the tricky point) */
 	TEST_ASSERT_EQUAL(1901, ntpcal_expand_century( 1, 3, 1, CAL_FRIDAY   ));
@@ -1043,7 +1043,7 @@ test_RellezCentury3_1()
 }
 
 void
-test_RellezYearZero()
+test_RellezYearZero(void)
 {
 	/* the infamous year zero */
 	TEST_ASSERT_EQUAL(1900, ntpcal_expand_century( 0, 1, 1, CAL_MONDAY   ));
diff --git a/tests/libntp/caljulian.c b/tests/libntp/caljulian.c
index 409a4ad14f4d..8c22ef63771a 100644
--- a/tests/libntp/caljulian.c
+++ b/tests/libntp/caljulian.c
@@ -2,7 +2,6 @@
 
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
-#include "lib_strbuf.h"
 
 #include "unity.h"
 #include "test-libntp.h"
diff --git a/tests/libntp/clocktime.c b/tests/libntp/clocktime.c
index ed2d4b2b187d..50934273f662 100644
--- a/tests/libntp/clocktime.c
+++ b/tests/libntp/clocktime.c
@@ -28,7 +28,7 @@ void test_AlwaysInLimit(void);
  */
 
 void
-setUp()
+setUp(void)
 {
 	ntpcal_set_timefunc(timefunc);
 	settime(2000, 1, 1, 0, 0, 0);
@@ -37,7 +37,7 @@ setUp()
 }
 
 void
-tearDown()
+tearDown(void)
 {
 	ntpcal_set_timefunc(NULL);
 
diff --git a/tests/libntp/data/ntp.keys b/tests/libntp/data/ntp.keys
index 6c8c743fd7d2..ef634dd00ebd 100644
--- a/tests/libntp/data/ntp.keys
+++ b/tests/libntp/data/ntp.keys
@@ -1,15 +1,16 @@
-# 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
+# This unit test ntp.keys file has hard-coded the union of sets
+# of OpenSSL-supported digest algorithms we've come across.  It
+# needs to be updated as algorithms are observed.  A list can be
 # obtained with:
 #
 # ntpq -c "help keytype"
 #
-# tests/libntp/digest.c similarly hardcodes the list of digests
-# to test.
+# tests/libntp/digests.c similarly hardcodes the list of digests
+# to test.  This file must be kept in sync with it.
 #
 # 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`
@@ -18,9 +19,9 @@
  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
+ 8 DSA		306+^SHLV5{"v7W`U3aY
+ 9 DSA-SHA	lGyKZgsI_Pi"y"8JAT98
+10 SHA		2:VO]Q5u%/b&}.<P?T~9
 
 51 AES128CMAC 	d0cd9f3ee181769ca7cccaada09f093c5fe8e628
 52 MD4		7080bc47eea6b379b2ff841805a144fb4a241a16
@@ -29,6 +30,6 @@
 55 RIPEMD160	6028ec169bfbe55ab61ffa7baa34b482020f0619
 56 SHA1		17d96a86eb9b9075f33e1c0a08bb2bb61e916e33
 57 SHAKE128	70da1a91030eb91836c1cf76cf67ddfd6b96fa91
-58 SHA1		7ce5deea7569d7423d5e1b497c8eb3bfeff852d5	# unused so far
-59 SHA1		9fd568e8f371deae54a65bc50b52bbe1f6529589	# unused
-60 SHA1		ce85046978a4df8366e102c4f1267399bbc25737	# unused
+58 DSA		7ce5deea7569d7423d5e1b497c8eb3bfeff852d5
+59 DSA-SHA	9fd568e8f371deae54a65bc50b52bbe1f6529589
+60 SHA		ce85046978a4df8366e102c4f1267399bbc25737
diff --git a/tests/libntp/digests.c b/tests/libntp/digests.c
index 03e9ef1b838e..10b9d2c12ac0 100644
--- a/tests/libntp/digests.c
+++ b/tests/libntp/digests.c
@@ -110,7 +110,7 @@ do {									\
 	authtrust((key), 1);						\
 									\
 	res_sz = authencrypt((key), pkt, pkt_sz);			\
-	if (KEY_MAC_LEN == res_sz) {					\
+	if (0 == res_sz) {						\
 		TEST_IGNORE_MESSAGE("Likely OpenSSL 3 failed digest "	\
 				    "init.");				\
 		return;							\
@@ -363,7 +363,7 @@ void test_Digest_SHAKE128(void)
 			0xaa, 0xa6, 0xcd, 0x76
 		};
 	u_char expectedB[MAX_MAC_LEN] =
-		{ 
+		{
 			0, 0, 0, KEYID_B,
 			0x07, 0x04, 0x63, 0xcc,
 			0x46, 0xaf, 0xca, 0x00,
@@ -380,6 +380,123 @@ void test_Digest_SHAKE128(void)
 }
 
 
+#define DSA_KEYID		8
+#undef KEYID_A
+#define KEYID_A			DSA_KEYID
+#undef DG_SZ
+#define DG_SZ			20
+#undef KEYID_B
+#define KEYID_B			(KEYID_A + HEX_KEYID_OFFSET)
+void test_Digest_DSA(void);
+void test_Digest_DSA(void)
+{
+#ifdef OPENSSL
+	u_char expectedA[MAX_MAC_LEN] =
+		{
+			0, 0, 0, KEYID_A,
+			0xaf, 0xa0, 0x1d, 0x0c,
+			0x92, 0xcb, 0xca, 0x95,
+			0x0d, 0x57, 0x60, 0x49,
+			0xe5, 0x28, 0x03, 0xf2,
+			0x7b, 0x5b, 0xb1, 0x4a
+		};
+	u_char expectedB[MAX_MAC_LEN] =
+		{
+			0, 0, 0, KEYID_B,
+			0x77, 0xcd, 0x88, 0xc2,
+			0xed, 0x5d, 0x57, 0xc5,
+			0x28, 0x92, 0xf0, 0x21,
+			0x2b, 0xb9, 0x48, 0xac,
+			0xfe, 0x9f, 0xf5, 0x1c
+		};
+
+	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 DSA_SHA_KEYID		9
+#undef KEYID_A
+#define KEYID_A			DSA_SHA_KEYID
+#undef DG_SZ
+#define DG_SZ			20
+#undef KEYID_B
+#define KEYID_B			(KEYID_A + HEX_KEYID_OFFSET)
+void test_Digest_DSA_SHA(void);
+void test_Digest_DSA_SHA(void)
+{
+#ifdef OPENSSL
+	u_char expectedA[MAX_MAC_LEN] =
+		{
+			0, 0, 0, KEYID_A,
+			0x7c, 0xb5, 0x79, 0xd0,
+			0xf2, 0xcd, 0x47, 0xc0,
+			0x21, 0xf3, 0xf5, 0x04,
+			0x10, 0xc4, 0x59, 0x5c,
+			0xd9, 0xa4, 0x4f, 0x3b
+		};
+	u_char expectedB[MAX_MAC_LEN] =
+		{
+			0, 0, 0, KEYID_B,
+			0xb9, 0xca, 0xa6, 0x8e,
+			0xd3, 0xcb, 0x94, 0x6a,
+			0x6d, 0xae, 0xb4, 0xc8,
+			0x0e, 0xc9, 0xf6, 0xed,
+			0x58, 0x1a, 0xed, 0x22
+		};
+
+	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 SHA_KEYID		10
+#undef KEYID_A
+#define KEYID_A			SHA_KEYID
+#undef DG_SZ
+#define DG_SZ			20
+#undef KEYID_B
+#define KEYID_B			(KEYID_A + HEX_KEYID_OFFSET)
+void test_Digest_SHA(void);
+void test_Digest_SHA(void)
+{
+#ifdef OPENSSL
+	u_char expectedA[MAX_MAC_LEN] =
+		{
+			0, 0, 0, KEYID_A,
+			0xd5, 0xbd, 0xb8, 0x55,
+			0x9b, 0x9e, 0x5e, 0x8f,
+			0x1a, 0x3d, 0x99, 0x60,
+			0xbd, 0x70, 0x0c, 0x5c,
+			0x68, 0xae, 0xb0, 0xbd
+		};
+	u_char expectedB[MAX_MAC_LEN] =
+		{
+			0, 0, 0, KEYID_B,
+			0x63, 0x05, 0x41, 0x45,
+			0xe9, 0x61, 0x84, 0xe7,
+			0xc6, 0x94, 0x24, 0xa4,
+			0x84, 0x76, 0xc7, 0xc9,
+			0xdd, 0x80, 0x80, 0x89
+		};
+
+	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.
  */
@@ -395,8 +512,8 @@ void dump_mac(
 
 	dc += snprintf(dump + dc, sizeof(dump) - dc, "digest with key %u { ", keyid);
 
-	for (idx = 0; idx < octets; idx++) {
-		if (10 == idx) {
+	for (idx = 4; idx < octets; idx++) {
+		if (14 == idx) {
 			msyslog(LOG_DEBUG, "%s", dump);
 			dc = 0;
 		}
diff --git a/tests/libntp/netof.c b/tests/libntp/netof.c
index be197cf18b8a..c1970097636c 100644
--- a/tests/libntp/netof.c
+++ b/tests/libntp/netof.c
@@ -9,9 +9,7 @@
 
 
 void setUp(void);
-void test_ClassBAddress(void);
 void test_ClassCAddress(void);
-void test_ClassAAddress(void);
 void test_IPv6Address(void);
 
 
@@ -25,20 +23,6 @@ setUp(void)
 
 
 void
-test_ClassBAddress(void)
-{
-	sockaddr_u input = CreateSockaddr4("172.16.2.1", NTP_PORT);
-	sockaddr_u expected = CreateSockaddr4("172.16.0.0", NTP_PORT);
-
-	sockaddr_u* actual = netof(&input);
-
-	TEST_ASSERT_TRUE(actual != NULL);
-	TEST_ASSERT_TRUE(IsEqual(expected, *actual));
-
-	return;
-}
-
-void
 test_ClassCAddress(void)
 {
 	sockaddr_u input = CreateSockaddr4("192.0.2.255", NTP_PORT);
@@ -54,23 +38,6 @@ test_ClassCAddress(void)
 
 
 void
-test_ClassAAddress(void)
-{
-	/* Class A addresses are assumed to be classless,
-	 * thus the same address should be returned.
-	 */
-	sockaddr_u input = CreateSockaddr4("10.20.30.40", NTP_PORT);
-	sockaddr_u expected = CreateSockaddr4("10.20.30.40", NTP_PORT);
-
-	sockaddr_u* actual = netof(&input);
-
-	TEST_ASSERT_TRUE(actual != NULL);
-	TEST_ASSERT_TRUE(IsEqual(expected, *actual));
-
-	return;
-}
-
-void
 test_IPv6Address(void)
 {
 	/* IPv6 addresses are assumed to have 64-bit host- and 64-bit network parts. */
diff --git a/tests/libntp/numtohost.c b/tests/libntp/numtohost.c
deleted file mode 100644
index 1c095eb55cdd..000000000000
--- a/tests/libntp/numtohost.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "config.h"
-
-#include "ntp_stdlib.h"
-#include "ntp_fp.h"
-
-#include "unity.h"
-
-void setUp(void);
-void test_LoopbackNetNonResolve(void);
-
-
-void
-setUp(void)
-{
-	init_lib();
-
-	return;
-}
-
-
-void
-test_LoopbackNetNonResolve(void) {
-	/* A loopback address in 127.0.0.0/8 is chosen, and
-	 * numtohost() should not try to resolve it unless
-	 * it is 127.0.0.1
-	 */
-
-	const u_int32 input = 127*256*256*256 + 1*256 + 1; // 127.0.1.1
-
-	TEST_ASSERT_EQUAL_STRING("127.0.1.1", numtohost(htonl(input)));
-}
diff --git a/tests/libntp/refnumtoa.c b/tests/libntp/refnumtoa.c
index 9db5fb11d999..73b9026574d5 100644
--- a/tests/libntp/refnumtoa.c
+++ b/tests/libntp/refnumtoa.c
@@ -6,9 +6,6 @@
 #include "unity.h"
 
 
-/* Might need to be updated if a new refclock gets this id. */
-static const int UNUSED_REFCLOCK_ID = 250;
-
 void setUp(void);
 void test_LocalClock(void);
 void test_UnknownId(void);
@@ -27,22 +24,21 @@ void
 test_LocalClock(void) {
 #ifdef REFCLOCK		/* clockname() is useless otherwise */
 	/* We test with a refclock address of type LOCALCLOCK.
-	 * with id 8
+	 * with unit id 8
 	 */
-	u_int32 addr = REFCLOCK_ADDR;
-	addr |= REFCLK_LOCALCLOCK << 8;
-	addr |= 0x8;
-
+	const u_char unit = 8;
+	u_int32 addr;
+	char expected[100];
 	sockaddr_u address;
-	address.sa4.sin_family = AF_INET;
-	address.sa4.sin_addr.s_addr = htonl(addr);
 
-	char stringStart[100]= "";
-
-	strcat(stringStart, clockname(REFCLK_LOCALCLOCK));
-	strcat(stringStart, "(8)");
+	addr = REFCLOCK_ADDR;
+	addr |= REFCLK_LOCALCLOCK << 8;
+	addr |= unit;
 
-	char * expected = stringStart;
+	AF(&address) = AF_INET;
+	NSRCADR(&address) = htonl(addr);
+	snprintf(expected, sizeof(expected), "%s(%u)",
+		 clockname(REFCLK_LOCALCLOCK), unit);
 
 	TEST_ASSERT_EQUAL_STRING(expected, refnumtoa(&address));
 #else
@@ -54,20 +50,22 @@ void
 test_UnknownId(void) {
 #ifdef REFCLOCK		/* refnumtoa() is useless otherwise */
 	/* We test with a currently unused refclock ID */
-	u_int32 addr = REFCLOCK_ADDR;
+	/* Might need to be updated if a new refclock gets this id. */
+	const u_char UNUSED_REFCLOCK_ID = 250;
+	const u_char unit = 4;
+	u_int32 addr;
+	char expected[100];
+	sockaddr_u address;
+
+	addr = REFCLOCK_ADDR;
 	addr |= UNUSED_REFCLOCK_ID << 8;
-	addr |= 0x4;
+	addr |= unit;
 
-	sockaddr_u address;
-	address.sa4.sin_family = AF_INET;
-	address.sa4.sin_addr.s_addr = htonl(addr);
-
-	char stringStart[100]= "REFCLK(";
-	char value[100] ;
-	snprintf(value, sizeof(value), "%d", UNUSED_REFCLOCK_ID);
-	strcat(stringStart,value);
-	strcat(stringStart,",4)");
-	char * expected = stringStart;
+	AF(&address) = AF_INET;
+	NSRCADR(&address) = htonl(addr);
+
+	snprintf(expected, sizeof(expected), "REFCLK(%u,%u)",
+		 UNUSED_REFCLOCK_ID, unit);
 
 	TEST_ASSERT_EQUAL_STRING(expected, refnumtoa(&address));
 #else
diff --git a/tests/libntp/run-a_md5encrypt.c b/tests/libntp/run-a_md5encrypt.c
index 06dda63f07ba..14c7f84192d8 100644
--- a/tests/libntp/run-a_md5encrypt.c
+++ b/tests/libntp/run-a_md5encrypt.c
@@ -62,11 +62,11 @@ int main(int argc, char *argv[])
   progname = argv[0];
   suite_setup();
   UnityBegin("a_md5encrypt.c");
-  RUN_TEST(test_Encrypt, 41);
-  RUN_TEST(test_DecryptValid, 42);
-  RUN_TEST(test_DecryptInvalid, 43);
-  RUN_TEST(test_IPv4AddressToRefId, 44);
-  RUN_TEST(test_IPv6AddressToRefId, 45);
+  RUN_TEST(test_Encrypt, 63);
+  RUN_TEST(test_DecryptValid, 64);
+  RUN_TEST(test_DecryptInvalid, 65);
+  RUN_TEST(test_IPv4AddressToRefId, 66);
+  RUN_TEST(test_IPv6AddressToRefId, 67);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-caljulian.c b/tests/libntp/run-caljulian.c
index fff7c0b87939..4fd633920611 100644
--- a/tests/libntp/run-caljulian.c
+++ b/tests/libntp/run-caljulian.c
@@ -25,7 +25,6 @@
 #include "config.h"
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
-#include "lib_strbuf.h"
 #include "test-libntp.h"
 #include <string.h>
 
@@ -64,10 +63,10 @@ int main(int argc, char *argv[])
   progname = argv[0];
   suite_setup();
   UnityBegin("caljulian.c");
-  RUN_TEST(test_RegularTime, 15);
-  RUN_TEST(test_LeapYear, 16);
-  RUN_TEST(test_uLongBoundary, 17);
-  RUN_TEST(test_uLongWrapped, 18);
+  RUN_TEST(test_RegularTime, 14);
+  RUN_TEST(test_LeapYear, 15);
+  RUN_TEST(test_uLongBoundary, 16);
+  RUN_TEST(test_uLongWrapped, 17);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-digests.c b/tests/libntp/run-digests.c
index ae574d0e239e..bc56f1cb92e6 100644
--- a/tests/libntp/run-digests.c
+++ b/tests/libntp/run-digests.c
@@ -40,6 +40,9 @@ extern void test_Digest_MDC2(void);
 extern void test_Digest_RIPEMD160(void);
 extern void test_Digest_SHA1(void);
 extern void test_Digest_SHAKE128(void);
+extern void test_Digest_DSA(void);
+extern void test_Digest_DSA_SHA(void);
+extern void test_Digest_SHA(void);
 
 
 //=======Suite Setup=====
@@ -75,6 +78,9 @@ int main(int argc, char *argv[])
   RUN_TEST(test_Digest_RIPEMD160, 275);
   RUN_TEST(test_Digest_SHA1, 314);
   RUN_TEST(test_Digest_SHAKE128, 353);
+  RUN_TEST(test_Digest_DSA, 390);
+  RUN_TEST(test_Digest_DSA_SHA, 429);
+  RUN_TEST(test_Digest_SHA, 468);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-netof.c b/tests/libntp/run-netof.c
index 9c81f38475bb..f753e39a1ad3 100644
--- a/tests/libntp/run-netof.c
+++ b/tests/libntp/run-netof.c
@@ -30,9 +30,7 @@
 //=======External Functions This Runner Calls=====
 extern void setUp(void);
 extern void tearDown(void);
-extern void test_ClassBAddress(void);
 extern void test_ClassCAddress(void);
-extern void test_ClassAAddress(void);
 extern void test_IPv6Address(void);
 
 
@@ -62,10 +60,8 @@ int main(int argc, char *argv[])
   progname = argv[0];
   suite_setup();
   UnityBegin("netof.c");
-  RUN_TEST(test_ClassBAddress, 12);
-  RUN_TEST(test_ClassCAddress, 13);
-  RUN_TEST(test_ClassAAddress, 14);
-  RUN_TEST(test_IPv6Address, 15);
+  RUN_TEST(test_ClassCAddress, 12);
+  RUN_TEST(test_IPv6Address, 13);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-numtohost.c b/tests/libntp/run-numtohost.c
deleted file mode 100644
index 3129845f7cf9..000000000000
--- a/tests/libntp/run-numtohost.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* 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_stdlib.h"
-#include "ntp_fp.h"
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_LoopbackNetNonResolve(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("numtohost.c");
-  RUN_TEST(test_LoopbackNetNonResolve, 9);
-
-  return (UnityEnd());
-}
diff --git a/tests/libntp/run-refnumtoa.c b/tests/libntp/run-refnumtoa.c
index e56c9a1158e1..1b48534ecd1f 100644
--- a/tests/libntp/run-refnumtoa.c
+++ b/tests/libntp/run-refnumtoa.c
@@ -59,8 +59,8 @@ int main(int argc, char *argv[])
   progname = argv[0];
   suite_setup();
   UnityBegin("refnumtoa.c");
-  RUN_TEST(test_LocalClock, 13);
-  RUN_TEST(test_UnknownId, 14);
+  RUN_TEST(test_LocalClock, 10);
+  RUN_TEST(test_UnknownId, 11);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-ssl_init.c b/tests/libntp/run-ssl_init.c
index 8450a27c3d9d..0ec84eb1935c 100644
--- a/tests/libntp/run-ssl_init.c
+++ b/tests/libntp/run-ssl_init.c
@@ -63,13 +63,13 @@ int main(int argc, char *argv[])
   progname = argv[0];
   suite_setup();
   UnityBegin("ssl_init.c");
-  RUN_TEST(test_MD5KeyTypeWithoutDigestLength, 20);
-  RUN_TEST(test_MD5KeyTypeWithDigestLength, 21);
-  RUN_TEST(test_SHA1KeyTypeWithDigestLength, 22);
-  RUN_TEST(test_CMACKeyTypeWithDigestLength, 23);
-  RUN_TEST(test_MD5KeyName, 24);
-  RUN_TEST(test_SHA1KeyName, 25);
-  RUN_TEST(test_CMACKeyName, 26);
+  RUN_TEST(test_MD5KeyTypeWithoutDigestLength, 16);
+  RUN_TEST(test_MD5KeyTypeWithDigestLength, 17);
+  RUN_TEST(test_SHA1KeyTypeWithDigestLength, 18);
+  RUN_TEST(test_CMACKeyTypeWithDigestLength, 19);
+  RUN_TEST(test_MD5KeyName, 20);
+  RUN_TEST(test_SHA1KeyName, 21);
+  RUN_TEST(test_CMACKeyName, 22);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/ssl_init.c b/tests/libntp/ssl_init.c
index 69b395e051e9..d42b5592e3a8 100644
--- a/tests/libntp/ssl_init.c
+++ b/tests/libntp/ssl_init.c
@@ -13,10 +13,6 @@
 #include "unity.h"
 
 
-static const size_t TEST_MD5_DIGEST_LENGTH = 16;
-static const size_t TEST_SHA1_DIGEST_LENGTH = 20;
-static const size_t TEST_CMAC_DIGEST_LENGTH = 16;
-
 void test_MD5KeyTypeWithoutDigestLength(void);
 void test_MD5KeyTypeWithDigestLength(void);
 void test_SHA1KeyTypeWithDigestLength(void);
@@ -35,7 +31,7 @@ test_MD5KeyTypeWithoutDigestLength(void) {
 void
 test_MD5KeyTypeWithDigestLength(void) {
 	size_t digestLength;
-	size_t expected = TEST_MD5_DIGEST_LENGTH;
+	size_t expected = MD5_LENGTH;
 
 	TEST_ASSERT_EQUAL(KEY_TYPE_MD5, keytype_from_text("MD5", &digestLength));
 	TEST_ASSERT_EQUAL(expected, digestLength);
@@ -46,7 +42,7 @@ void
 test_SHA1KeyTypeWithDigestLength(void) {
 #ifdef OPENSSL
 	size_t digestLength;
-	size_t expected = TEST_SHA1_DIGEST_LENGTH;
+	size_t expected = SHA1_LENGTH;
 
 	TEST_ASSERT_EQUAL(NID_sha1, keytype_from_text("SHA1", &digestLength));
 	TEST_ASSERT_EQUAL(expected, digestLength);
@@ -61,7 +57,7 @@ void
 test_CMACKeyTypeWithDigestLength(void) {
 #if defined(OPENSSL) && defined(ENABLE_CMAC)
 	size_t digestLength;
-	size_t expected = TEST_CMAC_DIGEST_LENGTH;
+	size_t expected = CMAC_LENGTH;
 
 	TEST_ASSERT_EQUAL(NID_cmac, keytype_from_text(CMAC, &digestLength));
 	TEST_ASSERT_EQUAL(expected, digestLength);
diff --git a/tests/libntp/timevalops.c b/tests/libntp/timevalops.c
index 0c498ca396b6..4dff90c24df4 100644
--- a/tests/libntp/timevalops.c
+++ b/tests/libntp/timevalops.c
@@ -119,9 +119,9 @@ AssertTimevalClose(const struct timeval m, const struct timeval n, const struct
 
 	printf("m_expr which is %lld.%06lu \nand\n"
 	       "n_expr which is %lld.%06lu\nare not close; diff=%lld.%06luusec\n",
-	       (long long)m.tv_sec, m.tv_usec,
-	       (long long)n.tv_sec, n.tv_usec,
-	       (long long)diff.tv_sec, diff.tv_usec); 
+	       (long long)m.tv_sec, (u_long)m.tv_usec,
+	       (long long)n.tv_sec, (u_long)n.tv_usec,
+	       (long long)diff.tv_sec, (u_long)diff.tv_usec); 
 	return FALSE;
 }
 
diff --git a/tests/libntp/vi64ops.c b/tests/libntp/vi64ops.c
index 0891299e52fd..10e04629d6cb 100644
--- a/tests/libntp/vi64ops.c
+++ b/tests/libntp/vi64ops.c
@@ -38,8 +38,8 @@ IsEqual(const vint64 expected, const vint64 actual) {
 void
 test_ParseVUI64_pos(void) {
 	vint64 act, exp;
-	const char *sp;
-	char const *ep;
+	char *sp;
+	char *ep;
 
 	sp         = "1234x";
 	exp.D_s.hi = 0;
@@ -54,8 +54,8 @@ test_ParseVUI64_pos(void) {
 void
 test_ParseVUI64_neg(void) {
 	vint64 act, exp;
-	const char *sp;
-	char const *ep;
+	char *sp;
+	char *ep;
 
 	sp         = "-1234x";
 	exp.D_s.hi = ~0;
@@ -68,8 +68,8 @@ test_ParseVUI64_neg(void) {
 void
 test_ParseVUI64_case(void) {
 	vint64 act, exp;
-	const char *sp;
-	char const *ep;
+	char *sp;
+	char *ep;
 
 	sp         = "0123456789AbCdEf";
 	exp.D_s.hi = 0x01234567;
diff --git a/tests/ntpd/Makefile.in b/tests/ntpd/Makefile.in
index fb0b08a2b548..b96659659b0e 100644
--- a/tests/ntpd/Makefile.in
+++ b/tests/ntpd/Makefile.in
@@ -96,6 +96,7 @@ check_PROGRAMS = test-leapsec$(EXEEXT) test-ntp_prio_q$(EXEEXT) \
 EXTRA_PROGRAMS = test-ntp_restrict$(EXEEXT) test-ntp_scanner$(EXEEXT) \
 	test-ntp_signd$(EXEEXT) $(am__EXEEXT_1)
 @NTP_CROSSCOMPILE_FALSE@am__append_4 = $(check_PROGRAMS)
+@LIBNTP_SUBMAKES_TRUE@am__append_5 = check-libntp
 subdir = tests/ntpd
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -683,6 +684,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
+PATH_OPENSSL = @PATH_OPENSSL@
 PATH_PERL = @PATH_PERL@
 PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
@@ -784,14 +786,9 @@ top_srcdir = @top_srcdir@
 NULL = 
 BUILT_SOURCES = $(srcdir)/run-leapsec.c $(srcdir)/run-ntp_prio_q.c \
 	$(srcdir)/run-ntp_restrict.c $(srcdir)/run-rc_cmdlength.c \
-	$(srcdir)/run-t-ntp_signd.c $(NULL) check-libntp check-libntpd \
-	check-libunity .deps-ver
-
-# CLEANFILES addition below won't be needed after a while.
-# Leave it in for now for folks tracking the source repo
-# who have the file from a former version of the rule.
-# DLH Jan 2023
-CLEANFILES = check-libntp check-libntpd .deps-ver
+	$(srcdir)/run-t-ntp_signd.c $(NULL) $(am__append_5) \
+	check-libntpd check-libunity .deps-ver
+CLEANFILES = check-libunity .deps-ver
 DISTCLEANFILES = $(DEPDIR)/deps-ver
 std_unity_list = \
 	$(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
@@ -1746,20 +1743,17 @@ $(srcdir)/run-t-ntp_signd.c: $(srcdir)/t-ntp_signd.c $(std_unity_list)
 $(srcdir)/run-t-ntp_scanner.c: $(srcdir)/t-ntp_scanner.c $(std_unity_list)
 	$(run_unity) $< $@
 
-check-libntp: $(top_builddir)/libntp/libntp.a
-	@: avoid default SCCS get by some make implementations
+.PHONY: check-libntp
 
-$(top_builddir)/libntp/libntp.a:
-	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+@LIBNTP_SUBMAKES_TRUE@check-libntp:
+@LIBNTP_SUBMAKES_TRUE@	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
-check-libntpd: $(top_builddir)/ntpd/libntpd.a
-	 @: avoid default SCCS get by some make implementations
-
-$(top_builddir)/ntpd/libntpd.a:
+.PHONY: check-libntpd
+check-libntpd:
 	cd $(top_builddir)/ntpd && $(MAKE) $(AM_MAKEFLAGS) libntpd.a
 
 check-libunity: $(top_builddir)/sntp/unity/libunity.a
-	 @: avoid default SCCS get by some make implementations
+	@echo stamp > $@
 
 $(top_builddir)/sntp/unity/libunity.a:
 	cd $(top_builddir)/sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
diff --git a/tests/ntpd/leapsec.c b/tests/ntpd/leapsec.c
index 34a6ed76ee6d..7efae3d2db5d 100644
--- a/tests/ntpd/leapsec.c
+++ b/tests/ntpd/leapsec.c
@@ -6,7 +6,6 @@
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
 #include "ntp_leapsec.h"
-#include "lib_strbuf.h"
 
 #include "unity.h"
 
diff --git a/tests/ntpd/run-leapsec.c b/tests/ntpd/run-leapsec.c
index 6c9f243d6796..64ebecd5fcdf 100644
--- a/tests/ntpd/run-leapsec.c
+++ b/tests/ntpd/run-leapsec.c
@@ -27,7 +27,6 @@
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
 #include "ntp_leapsec.h"
-#include "lib_strbuf.h"
 #include "test-libntp.h"
 #include <string.h>
 
@@ -95,39 +94,39 @@ int main(int argc, char *argv[])
   progname = argv[0];
   suite_setup();
   UnityBegin("leapsec.c");
-  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);
+  RUN_TEST(test_ValidateGood, 328);
+  RUN_TEST(test_ValidateNoHash, 338);
+  RUN_TEST(test_ValidateBad, 348);
+  RUN_TEST(test_ValidateMalformed, 358);
+  RUN_TEST(test_ValidateMalformedShort, 368);
+  RUN_TEST(test_ValidateNoLeadZero, 378);
+  RUN_TEST(test_tableSelect, 393);
+  RUN_TEST(test_loadFileExpire, 430);
+  RUN_TEST(test_loadFileTTL, 448);
+  RUN_TEST(test_lsQueryPristineState, 481);
+  RUN_TEST(test_ls2009faraway, 495);
+  RUN_TEST(test_ls2009weekaway, 514);
+  RUN_TEST(test_ls2009houraway, 533);
+  RUN_TEST(test_ls2009secaway, 552);
+  RUN_TEST(test_ls2009onspot, 571);
+  RUN_TEST(test_ls2009nodata, 590);
+  RUN_TEST(test_ls2009limdata, 609);
+  RUN_TEST(test_qryJumpFarAhead, 632);
+  RUN_TEST(test_qryJumpAheadToTransition, 655);
+  RUN_TEST(test_qryJumpAheadOverTransition, 678);
+  RUN_TEST(test_addDynamic, 705);
+  RUN_TEST(test_taiEmptyTable, 891);
+  RUN_TEST(test_taiTableFixed, 905);
+  RUN_TEST(test_taiTableDynamic, 919);
+  RUN_TEST(test_taiTableDynamicDeadZone, 947);
+  RUN_TEST(test_ls2009seqInsElectric, 969);
+  RUN_TEST(test_ls2009seqInsDumb, 1014);
+  RUN_TEST(test_ls2009seqDelElectric, 1063);
+  RUN_TEST(test_ls2009seqDelDumb, 1108);
+  RUN_TEST(test_ls2012seqInsElectric, 1152);
+  RUN_TEST(test_ls2012seqInsDumb, 1197);
+  RUN_TEST(test_lsEmptyTableDumb, 1248);
+  RUN_TEST(test_lsEmptyTableElectric, 1271);
 
   return (UnityEnd());
 }
diff --git a/tests/ntpq/Makefile.in b/tests/ntpq/Makefile.in
index 7678393037aa..83abb41eb2d9 100644
--- a/tests/ntpq/Makefile.in
+++ b/tests/ntpq/Makefile.in
@@ -90,6 +90,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = test-ntpq$(EXEEXT) $(am__EXEEXT_1)
 @NTP_CROSSCOMPILE_FALSE@am__append_1 = $(check_PROGRAMS)
+@LIBNTP_SUBMAKES_TRUE@am__append_2 = check-libntp
 subdir = tests/ntpq
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -598,6 +599,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
+PATH_OPENSSL = @PATH_OPENSSL@
 PATH_PERL = @PATH_PERL@
 PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
@@ -697,9 +699,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
-BUILT_SOURCES = $(srcdir)/run-t-ntpq.c $(NULL) check-libntp \
+BUILT_SOURCES = $(srcdir)/run-t-ntpq.c $(NULL) $(am__append_2) \
 	check-libunity .deps-ver
-CLEANFILES = check-libntp .deps-ver
+CLEANFILES = check-libunity .deps-ver
 DISTCLEANFILES = $(DEPDIR)/deps-ver
 std_unity_list = \
 	$(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
@@ -1231,14 +1233,13 @@ uninstall-am:
 $(srcdir)/run-t-ntpq.c: $(srcdir)/t-ntpq.c $(std_unity_list)
 	$(run_unity) $< $@
 
-check-libntp: $(top_builddir)/libntp/libntp.a
-	@: avoid default SCCS get by some make implementations
+.PHONY: check-libntp
 
-$(top_builddir)/libntp/libntp.a:
-	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+@LIBNTP_SUBMAKES_TRUE@check-libntp:
+@LIBNTP_SUBMAKES_TRUE@	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
 check-libunity: $(top_builddir)/sntp/unity/libunity.a
-	 @: avoid default SCCS get by some make implementations
+	@echo stamp > $@
 
 $(top_builddir)/sntp/unity/libunity.a:
 	cd $(top_builddir)/sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
diff --git a/tests/sandbox/Makefile.in b/tests/sandbox/Makefile.in
index 5d1376c573a6..3088616298e7 100644
--- a/tests/sandbox/Makefile.in
+++ b/tests/sandbox/Makefile.in
@@ -92,6 +92,7 @@ check_PROGRAMS = first-test$(EXEEXT) smeartest$(EXEEXT) \
 EXTRA_PROGRAMS = bug-2803$(EXEEXT) second-test$(EXEEXT) \
 	$(am__EXEEXT_1)
 @NTP_CROSSCOMPILE_FALSE@am__append_1 = $(check_PROGRAMS)
+@LIBNTP_SUBMAKES_TRUE@am__append_2 = check-libntp
 subdir = tests/sandbox
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -623,6 +624,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
+PATH_OPENSSL = @PATH_OPENSSL@
 PATH_PERL = @PATH_PERL@
 PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
@@ -723,8 +725,8 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
 BUILT_SOURCES = run-ut-2803.c run-uglydate.c run-modetoa.c \
-	check-libntp check-libunity .deps-ver
-CLEANFILES = check-libntp .deps-ver
+	$(am__append_2) check-libunity .deps-ver
+CLEANFILES = check-libunity .deps-ver
 DISTCLEANFILES = $(DEPDIR)/deps-ver
 std_unity_list = \
 	$(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
@@ -1301,14 +1303,13 @@ $(srcdir)/run-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list)
 $(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list)
 	$(run_unity) $< $@
 
-check-libntp: $(top_builddir)/libntp/libntp.a
-	@: avoid default SCCS get by some make implementations
+.PHONY: check-libntp
 
-$(top_builddir)/libntp/libntp.a:
-	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+@LIBNTP_SUBMAKES_TRUE@check-libntp:
+@LIBNTP_SUBMAKES_TRUE@	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
 check-libunity: $(top_builddir)/sntp/unity/libunity.a
-	 @: avoid default SCCS get by some make implementations
+	@echo stamp > $@
 
 $(top_builddir)/sntp/unity/libunity.a:
 	cd $(top_builddir)/sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
diff --git a/tests/sec-2853/Makefile.in b/tests/sec-2853/Makefile.in
index a5615919f718..8c441ce372ed 100644
--- a/tests/sec-2853/Makefile.in
+++ b/tests/sec-2853/Makefile.in
@@ -89,6 +89,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = sec-2853$(EXEEXT)
 @NTP_CROSSCOMPILE_FALSE@am__append_1 = $(check_PROGRAMS)
+@LIBNTP_SUBMAKES_TRUE@am__append_2 = check-libntp
 subdir = tests/sec-2853
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
@@ -593,6 +594,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
+PATH_OPENSSL = @PATH_OPENSSL@
 PATH_PERL = @PATH_PERL@
 PATH_RUBY = @PATH_RUBY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
@@ -694,14 +696,9 @@ top_srcdir = @top_srcdir@
 
 #AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects
 NULL = 
-BUILT_SOURCES = $(srcdir)/run-sec-2853.c check-libntp check-libntpd \
+BUILT_SOURCES = $(srcdir)/run-sec-2853.c $(am__append_2) check-libntpd \
 	check-libunity .deps-ver
-
-# CLEANFILES addition below won't be needed after a while.
-# Leave it in for now for folks tracking the source repo
-# who have the file from a former version of the rule.
-# DLH Jan 2023
-CLEANFILES = check-libntp check-libntpd .deps-ver
+CLEANFILES = check-libunity .deps-ver
 DISTCLEANFILES = $(DEPDIR)/deps-ver
 std_unity_list = \
 	$(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
@@ -1229,20 +1226,17 @@ uninstall-am:
 $(srcdir)/run-sec-2853.c: $(srcdir)/sec-2853.c $(std_unity_list)
 	$(run_unity) $< $@
 
-check-libntp: $(top_builddir)/libntp/libntp.a
-	@: avoid default SCCS get by some make implementations
-
-$(top_builddir)/libntp/libntp.a:
-	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+.PHONY: check-libntp
 
-check-libntpd: $(top_builddir)/ntpd/libntpd.a
-	 @: avoid default SCCS get by some make implementations
+@LIBNTP_SUBMAKES_TRUE@check-libntp:
+@LIBNTP_SUBMAKES_TRUE@	cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
-$(top_builddir)/ntpd/libntpd.a:
+.PHONY: check-libntpd
+check-libntpd:
 	cd $(top_builddir)/ntpd && $(MAKE) $(AM_MAKEFLAGS) libntpd.a
 
 check-libunity: $(top_builddir)/sntp/unity/libunity.a
-	 @: avoid default SCCS get by some make implementations
+	@echo stamp > $@
 
 $(top_builddir)/sntp/unity/libunity.a:
 	cd $(top_builddir)/sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a