diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-10-31 21:22:01 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-01 09:46:09 +1100 |
commit | 07da39f71d36fb547749a5b16aa8892e621a7e4a (patch) | |
tree | dd75cbd723102d887bc11f781cc0a23eee6b2f2f /Makefile.in | |
parent | eebec620c9519c4839d781c4d5b6082152998f82 (diff) |
upstream: ssh-agent support for U2F/FIDO keys
feedback & ok markus@
OpenBSD-Commit-ID: bb544a44bc32e45d2ec8bf652db2046f38360acb
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index bac522ad2..c4b4b9357 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -24,6 +24,7 @@ ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass | |||
24 | SFTP_SERVER=$(libexecdir)/sftp-server | 24 | SFTP_SERVER=$(libexecdir)/sftp-server |
25 | SSH_KEYSIGN=$(libexecdir)/ssh-keysign | 25 | SSH_KEYSIGN=$(libexecdir)/ssh-keysign |
26 | SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper | 26 | SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper |
27 | SSH_SK_HELPER=$(libexecdir)/ssh-sk-helper | ||
27 | PRIVSEP_PATH=@PRIVSEP_PATH@ | 28 | PRIVSEP_PATH=@PRIVSEP_PATH@ |
28 | SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ | 29 | SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ |
29 | STRIP_OPT=@STRIP_OPT@ | 30 | STRIP_OPT=@STRIP_OPT@ |
@@ -35,6 +36,7 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \ | |||
35 | -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ | 36 | -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ |
36 | -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ | 37 | -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ |
37 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ | 38 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ |
39 | -D_PATH_SSH_SK_HELPER=\"$(SSH_SK_HELPER)\" \ | ||
38 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ | 40 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ |
39 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" | 41 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" |
40 | 42 | ||
@@ -60,7 +62,7 @@ EXEEXT=@EXEEXT@ | |||
60 | MANFMT=@MANFMT@ | 62 | MANFMT=@MANFMT@ |
61 | MKDIR_P=@MKDIR_P@ | 63 | MKDIR_P=@MKDIR_P@ |
62 | 64 | ||
63 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) | 65 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-sk-helper$(EXEEXT) |
64 | 66 | ||
65 | XMSS_OBJS=\ | 67 | XMSS_OBJS=\ |
66 | ssh-xmss.o \ | 68 | ssh-xmss.o \ |
@@ -199,6 +201,9 @@ ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o readconf.o uidswap.o c | |||
199 | ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o | 201 | ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o |
200 | $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 202 | $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
201 | 203 | ||
204 | ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-sk-helper.o | ||
205 | $(LD) -o $@ ssh-sk-helper.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
206 | |||
202 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o | 207 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o |
203 | $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) | 208 | $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) |
204 | 209 | ||
@@ -350,6 +355,7 @@ install-files: | |||
350 | $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) | 355 | $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) |
351 | $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) | 356 | $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) |
352 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) | 357 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) |
358 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-sk-helper$(EXEEXT) $(DESTDIR)$(SSH_SK_HELPER)$(EXEEXT) | ||
353 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT) | 359 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT) |
354 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) | 360 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) |
355 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 361 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
@@ -426,6 +432,7 @@ uninstall: | |||
426 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) | 432 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) |
427 | -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) | 433 | -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) |
428 | -rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) | 434 | -rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) |
435 | -rm -f $(DESTDIR)$(SSH_SK_HELPER)$(EXEEXT) | ||
429 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 436 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
430 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 | 437 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
431 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 | 438 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 |
@@ -616,10 +623,10 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) | |||
616 | TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ | 623 | TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ |
617 | TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ | 624 | TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ |
618 | TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ | 625 | TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ |
626 | TEST_SSH_SSHSKHELPER="$${BUILDDIR}/ssh-sk-helper"; \ | ||
619 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ | 627 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ |
620 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ | 628 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ |
621 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | 629 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ |
622 | TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ | ||
623 | TEST_SSH_PLINK="plink"; \ | 630 | TEST_SSH_PLINK="plink"; \ |
624 | TEST_SSH_PUTTYGEN="puttygen"; \ | 631 | TEST_SSH_PUTTYGEN="puttygen"; \ |
625 | TEST_SSH_CONCH="conch"; \ | 632 | TEST_SSH_CONCH="conch"; \ |