diff options
author | Damien Miller <djm@mindrot.org> | 2019-11-27 16:03:12 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-27 16:03:27 +1100 |
commit | 48989244658b9748b6801034ff4ffbdfc6b1520f (patch) | |
tree | 08c9a78848131a3a1ca370fa584e8b478ae762f8 /Makefile.in | |
parent | f79364bacaebde4f1c260318ab460fceacace02f (diff) |
wire sk-dummy.so into test suite
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index b2c93cdc3..80fb450b0 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -264,6 +264,8 @@ clean: regressclean | |||
264 | rm -f regress/unittests/utf8/test_utf8$(EXEEXT) | 264 | rm -f regress/unittests/utf8/test_utf8$(EXEEXT) |
265 | rm -f regress/misc/kexfuzz/*.o | 265 | rm -f regress/misc/kexfuzz/*.o |
266 | rm -f regress/misc/kexfuzz/kexfuzz$(EXEEXT) | 266 | rm -f regress/misc/kexfuzz/kexfuzz$(EXEEXT) |
267 | rm -f regress/misc/sk-dummy/*.o | ||
268 | rm -f regress/misc/sk-dummy/sk-dummy.so | ||
267 | (cd openbsd-compat && $(MAKE) clean) | 269 | (cd openbsd-compat && $(MAKE) clean) |
268 | 270 | ||
269 | distclean: regressclean | 271 | distclean: regressclean |
@@ -588,12 +590,23 @@ regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a | |||
588 | $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ | 590 | $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ |
589 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 591 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
590 | 592 | ||
593 | # These all need to be compiled -fPIC, so they are treated differently. | ||
594 | SK_DUMMY_SRCS=\ | ||
595 | regress/misc/sk-dummy/sk-dummy.c \ | ||
596 | ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c \ | ||
597 | digest-openssl.c ssherr.c fatal.c sshbuf.c log.c cleanup.c | ||
598 | |||
599 | regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_SRCS) | ||
600 | $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_SRCS) \ | ||
601 | -L. -Lopenbsd-compat -lopenbsd-compat $(LIBS) | ||
602 | |||
591 | regress-binaries: regress-prep $(LIBCOMPAT) \ | 603 | regress-binaries: regress-prep $(LIBCOMPAT) \ |
592 | regress/modpipe$(EXEEXT) \ | 604 | regress/modpipe$(EXEEXT) \ |
593 | regress/setuid-allowed$(EXEEXT) \ | 605 | regress/setuid-allowed$(EXEEXT) \ |
594 | regress/netcat$(EXEEXT) \ | 606 | regress/netcat$(EXEEXT) \ |
595 | regress/check-perm$(EXEEXT) \ | 607 | regress/check-perm$(EXEEXT) \ |
596 | regress/mkdtemp$(EXEEXT) | 608 | regress/mkdtemp$(EXEEXT) \ |
609 | regress/misc/sk-dummy/sk-dummy.so | ||
597 | 610 | ||
598 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ | 611 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ |
599 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ | 612 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ |
@@ -630,6 +643,9 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) | |||
630 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ | 643 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ |
631 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ | 644 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ |
632 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | 645 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ |
646 | TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ | ||
647 | TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper"; \ | ||
648 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | ||
633 | TEST_SSH_PLINK="plink"; \ | 649 | TEST_SSH_PLINK="plink"; \ |
634 | TEST_SSH_PUTTYGEN="puttygen"; \ | 650 | TEST_SSH_PUTTYGEN="puttygen"; \ |
635 | TEST_SSH_CONCH="conch"; \ | 651 | TEST_SSH_CONCH="conch"; \ |
@@ -654,6 +670,8 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) | |||
654 | TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ | 670 | TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ |
655 | TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ | 671 | TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ |
656 | TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ | 672 | TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ |
673 | TEST_SSH_PKCS11_HELPER="$${TEST_SSH_PKCS11_HELPER}" \ | ||
674 | TEST_SSH_SK_HELPER="$${TEST_SSH_SK_HELPER}" \ | ||
657 | TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ | 675 | TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ |
658 | TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ | 676 | TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ |
659 | TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ | 677 | TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ |