From 6d7d1063343b3971a0baa9e3aa85ae234a15edd7 Mon Sep 17 00:00:00 2001 From: djm Date: Thu, 21 Dec 2017 00:41:22 +0000 Subject: [PATCH] unbreak unit tests after removal of src/usr.bin/ssh/lib --- regress/usr.bin/ssh/unittests/Makefile.inc | 16 +++------------- regress/usr.bin/ssh/unittests/bitmap/Makefile | 6 +++++- .../usr.bin/ssh/unittests/conversion/Makefile | 7 ++++++- .../usr.bin/ssh/unittests/hostkeys/Makefile | 15 ++++++++++++++- regress/usr.bin/ssh/unittests/kex/Makefile | 19 ++++++++++++++++++- regress/usr.bin/ssh/unittests/sshbuf/Makefile | 6 +++++- regress/usr.bin/ssh/unittests/sshkey/Makefile | 15 ++++++++++++++- .../usr.bin/ssh/unittests/sshkey/test_fuzz.c | 6 +++--- .../ssh/unittests/sshkey/test_sshkey.c | 8 ++++---- regress/usr.bin/ssh/unittests/utf8/Makefile | 6 +++++- 10 files changed, 77 insertions(+), 27 deletions(-) diff --git a/regress/usr.bin/ssh/unittests/Makefile.inc b/regress/usr.bin/ssh/unittests/Makefile.inc index 13f8fb45951..d662a46bc0d 100644 --- a/regress/usr.bin/ssh/unittests/Makefile.inc +++ b/regress/usr.bin/ssh/unittests/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.11 2017/04/30 23:33:48 djm Exp $ +# $OpenBSD: Makefile.inc,v 1.12 2017/12/21 00:41:22 djm Exp $ REGRESS_FAIL_EARLY?= yes @@ -42,8 +42,8 @@ CDIAGFLAGS+= -Wswitch CDIAGFLAGS+= -Wtrigraphs CDIAGFLAGS+= -Wuninitialized CDIAGFLAGS+= -Wunused +CDIAGFLAGS+= -Wno-unused-parameter .if ${COMPILER_VERSION:L} != "gcc3" -CDIAGFLAGS+= -Wpointer-sign CDIAGFLAGS+= -Wold-style-definition .endif @@ -59,17 +59,7 @@ LDADD+=-L${.CURDIR}/../test_helper -ltest_helper DPADD+=${.CURDIR}/../test_helper/libtest_helper.a .endif -.if exists(${.CURDIR}/${SSHREL}/lib/${__objdir}) -LDADD+=-L${.CURDIR}/${SSHREL}/lib/${__objdir} -lssh -LIBSSH=${.CURDIR}/${SSHREL}/lib/${__objdir}/libssh.a -.else -LDADD+=-L${.CURDIR}/${SSHREL}/lib -lssh -LIBSSH=${.CURDIR}/${SSHREL}/lib/libssh.a -.endif -DPADD+=${LIBSSH} -${PROG}: ${LIBSSH} -${LIBSSH}: - cd ${.CURDIR}/${SSHREL} && ${MAKE} lib +.PATH: ${.CURDIR}/${SSHREL} LDADD+= -lutil DPADD+= ${LIBUTIL} diff --git a/regress/usr.bin/ssh/unittests/bitmap/Makefile b/regress/usr.bin/ssh/unittests/bitmap/Makefile index bd21949f8b5..fe30acc7739 100644 --- a/regress/usr.bin/ssh/unittests/bitmap/Makefile +++ b/regress/usr.bin/ssh/unittests/bitmap/Makefile @@ -1,7 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2016/11/01 13:43:27 tb Exp $ +# $OpenBSD: Makefile,v 1.4 2017/12/21 00:41:22 djm Exp $ PROG=test_bitmap SRCS=tests.c + +# From usr.sbin/ssh +SRCS+=bitmap.c atomicio.c + REGRESS_TARGETS=run-regress-${PROG} run-regress-${PROG}: ${PROG} diff --git a/regress/usr.bin/ssh/unittests/conversion/Makefile b/regress/usr.bin/ssh/unittests/conversion/Makefile index cde97dc28a9..8b2a09cc39f 100644 --- a/regress/usr.bin/ssh/unittests/conversion/Makefile +++ b/regress/usr.bin/ssh/unittests/conversion/Makefile @@ -1,7 +1,12 @@ -# $OpenBSD: Makefile,v 1.1 2017/03/14 01:20:29 dtucker Exp $ +# $OpenBSD: Makefile,v 1.2 2017/12/21 00:41:22 djm Exp $ PROG=test_conversion SRCS=tests.c + +# From usr.bin/ssh +SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c +SRCS+=atomicio.c misc.c xmalloc.c log.c uidswap.c cleanup.c fatal.c ssherr.c + REGRESS_TARGETS=run-regress-${PROG} run-regress-${PROG}: ${PROG} diff --git a/regress/usr.bin/ssh/unittests/hostkeys/Makefile b/regress/usr.bin/ssh/unittests/hostkeys/Makefile index ae3c342bdbd..3368851225c 100644 --- a/regress/usr.bin/ssh/unittests/hostkeys/Makefile +++ b/regress/usr.bin/ssh/unittests/hostkeys/Makefile @@ -1,7 +1,20 @@ -# $OpenBSD: Makefile,v 1.3 2016/11/01 13:43:27 tb Exp $ +# $OpenBSD: Makefile,v 1.4 2017/12/21 00:41:22 djm Exp $ PROG=test_hostkeys SRCS=tests.c test_iterate.c + +# From usr.bin/ssh +SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c +SRCS+=atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c ssh-dss.c +SRCS+=ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c +SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c +SRCS+=addrmatch.c bitmap.c hostfile.c +SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c +SRCS+=cipher-chachapoly.c chacha.c poly1305.c + +SRCS+=digest-openssl.c +#SRCS+=digest-libc.c + REGRESS_TARGETS=run-regress-${PROG} run-regress-${PROG}: ${PROG} diff --git a/regress/usr.bin/ssh/unittests/kex/Makefile b/regress/usr.bin/ssh/unittests/kex/Makefile index 7ed312675c8..5c61307a325 100644 --- a/regress/usr.bin/ssh/unittests/kex/Makefile +++ b/regress/usr.bin/ssh/unittests/kex/Makefile @@ -1,7 +1,24 @@ -# $OpenBSD: Makefile,v 1.4 2016/11/01 13:43:27 tb Exp $ +# $OpenBSD: Makefile,v 1.5 2017/12/21 00:41:22 djm Exp $ PROG=test_kex SRCS=tests.c test_kex.c + +# From usr.bin/ssh +SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c +SRCS+=atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c ssh-dss.c +SRCS+=ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c +SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c +SRCS+=addrmatch.c bitmap.c packet.c dispatch.c canohost.c ssh_api.c +SRCS+=kex.c kexc25519.c kexc25519c.c kexc25519s.c kexdh.c kexdhc.c kexdhs.c +SRCS+=kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c kexgexs.c +SRCS+=dh.c compat.c +SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c +SRCS+=cipher-chachapoly.c chacha.c poly1305.c +SRCS+=smult_curve25519_ref.c + +SRCS+=digest-openssl.c +#SRCS+=digest-libc.c + REGRESS_TARGETS=run-regress-${PROG} run-regress-${PROG}: ${PROG} diff --git a/regress/usr.bin/ssh/unittests/sshbuf/Makefile b/regress/usr.bin/ssh/unittests/sshbuf/Makefile index 54f227eec6b..b692e04e9ae 100644 --- a/regress/usr.bin/ssh/unittests/sshbuf/Makefile +++ b/regress/usr.bin/ssh/unittests/sshbuf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/11/01 13:43:27 tb Exp $ +# $OpenBSD: Makefile,v 1.6 2017/12/21 00:41:22 djm Exp $ PROG=test_sshbuf SRCS=tests.c @@ -10,6 +10,10 @@ SRCS+=test_sshbuf_fuzz.c SRCS+=test_sshbuf_getput_fuzz.c SRCS+=test_sshbuf_fixed.c +# From usr.bin/ssh +SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c +SRCS+=atomicio.c + run-regress-${PROG}: ${PROG} env ${TEST_ENV} ./${PROG} diff --git a/regress/usr.bin/ssh/unittests/sshkey/Makefile b/regress/usr.bin/ssh/unittests/sshkey/Makefile index 3b1752d66bc..c607f8dfa48 100644 --- a/regress/usr.bin/ssh/unittests/sshkey/Makefile +++ b/regress/usr.bin/ssh/unittests/sshkey/Makefile @@ -1,7 +1,20 @@ -# $OpenBSD: Makefile,v 1.4 2016/11/01 13:43:27 tb Exp $ +# $OpenBSD: Makefile,v 1.5 2017/12/21 00:41:22 djm Exp $ PROG=test_sshkey SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c + +# From usr.bin/ssh +SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c +SRCS+=atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c ssh-dss.c +SRCS+=ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c +SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c +SRCS+=addrmatch.c bitmap.c +SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c +SRCS+=cipher-chachapoly.c chacha.c poly1305.c + +SRCS+=digest-openssl.c +#SRCS+=digest-libc.c + REGRESS_TARGETS=run-regress-${PROG} run-regress-${PROG}: ${PROG} diff --git a/regress/usr.bin/ssh/unittests/sshkey/test_fuzz.c b/regress/usr.bin/ssh/unittests/sshkey/test_fuzz.c index 91418d8bab1..342ea695c73 100644 --- a/regress/usr.bin/ssh/unittests/sshkey/test_fuzz.c +++ b/regress/usr.bin/ssh/unittests/sshkey/test_fuzz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test_fuzz.c,v 1.7 2017/04/30 23:33:48 djm Exp $ */ +/* $OpenBSD: test_fuzz.c,v 1.8 2017/12/21 00:41:22 djm Exp $ */ /* * Fuzz tests for key parsing * @@ -77,7 +77,7 @@ sig_fuzz(struct sshkey *k, const char *sig_alg) fuzz = fuzz_begin(FUZZ_1_BIT_FLIP | /* too slow FUZZ_2_BIT_FLIP | */ FUZZ_1_BYTE_FLIP | FUZZ_2_BYTE_FLIP | FUZZ_TRUNCATE_START | FUZZ_TRUNCATE_END, sig, l); - ASSERT_INT_EQ(sshkey_verify(k, sig, l, c, sizeof(c), 0), 0); + ASSERT_INT_EQ(sshkey_verify(k, sig, l, c, sizeof(c), NULL, 0), 0); free(sig); TEST_ONERROR(onerror, fuzz); for(; !fuzz_done(fuzz); fuzz_next(fuzz)) { @@ -85,7 +85,7 @@ sig_fuzz(struct sshkey *k, const char *sig_alg) if (fuzz_matches_original(fuzz)) continue; ASSERT_INT_NE(sshkey_verify(k, fuzz_ptr(fuzz), fuzz_len(fuzz), - c, sizeof(c), 0), 0); + c, sizeof(c), NULL, 0), 0); } fuzz_cleanup(fuzz); } diff --git a/regress/usr.bin/ssh/unittests/sshkey/test_sshkey.c b/regress/usr.bin/ssh/unittests/sshkey/test_sshkey.c index 3807effdb69..f1bc1ec9a43 100644 --- a/regress/usr.bin/ssh/unittests/sshkey/test_sshkey.c +++ b/regress/usr.bin/ssh/unittests/sshkey/test_sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test_sshkey.c,v 1.12 2017/05/08 06:08:42 djm Exp $ */ +/* $OpenBSD: test_sshkey.c,v 1.13 2017/12/21 00:41:22 djm Exp $ */ /* * Regress test for sshkey.h key management API * @@ -115,11 +115,11 @@ signature_test(struct sshkey *k, struct sshkey *bad, const char *sig_alg, ASSERT_INT_EQ(sshkey_sign(k, &sig, &len, d, l, sig_alg, 0), 0); ASSERT_SIZE_T_GT(len, 8); ASSERT_PTR_NE(sig, NULL); - ASSERT_INT_EQ(sshkey_verify(k, sig, len, d, l, 0), 0); - ASSERT_INT_NE(sshkey_verify(bad, sig, len, d, l, 0), 0); + ASSERT_INT_EQ(sshkey_verify(k, sig, len, d, l, NULL, 0), 0); + ASSERT_INT_NE(sshkey_verify(bad, sig, len, d, l, NULL, 0), 0); /* Fuzz test is more comprehensive, this is just a smoke test */ sig[len - 5] ^= 0x10; - ASSERT_INT_NE(sshkey_verify(k, sig, len, d, l, 0), 0); + ASSERT_INT_NE(sshkey_verify(k, sig, len, d, l, NULL, 0), 0); free(sig); } diff --git a/regress/usr.bin/ssh/unittests/utf8/Makefile b/regress/usr.bin/ssh/unittests/utf8/Makefile index a975264fc14..f8eec0484f8 100644 --- a/regress/usr.bin/ssh/unittests/utf8/Makefile +++ b/regress/usr.bin/ssh/unittests/utf8/Makefile @@ -1,7 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2016/11/01 13:43:27 tb Exp $ +# $OpenBSD: Makefile,v 1.5 2017/12/21 00:41:22 djm Exp $ PROG=test_utf8 SRCS=tests.c + +# From usr.bin/ssh +SRCS+=utf8.c atomicio.c + REGRESS_TARGETS=run-regress-${PROG} run-regress-${PROG}: ${PROG} -- 2.20.1