diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 10:46:28 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 10:46:28 +0100 |
commit | efd3d4522636ae029488c2e9730b60c88e257d2e (patch) | |
tree | 31e02ac3f16090ce8c53448677356b2b7f423683 /Makefile.in | |
parent | bbec4db36d464ea1d464a707625125f9fd5c7b5e (diff) | |
parent | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff) |
* New upstream release (LP: #535029).
- After a transition period of about 10 years, this release disables SSH
protocol 1 by default. Clients and servers that need to use the
legacy protocol must explicitly enable it in ssh_config / sshd_config
or on the command-line.
- Remove the libsectok/OpenSC-based smartcard code and add support for
PKCS#11 tokens. This support is enabled by default in the Debian
packaging, since it now doesn't involve additional library
dependencies (closes: #231472, LP: #16918).
- Add support for certificate authentication of users and hosts using a
new, minimal OpenSSH certificate format (closes: #482806).
- Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
- Add the ability to revoke keys in sshd(8) and ssh(1). (For the Debian
package, this overlaps with the key blacklisting facility added in
openssh 1:4.7p1-9, but with different file formats and slightly
different scopes; for the moment, I've roughly merged the two.)
- Various multiplexing improvements, including support for requesting
port-forwardings via the multiplex protocol (closes: #360151).
- Allow setting an explicit umask on the sftp-server(8) commandline to
override whatever default the user has (closes: #496843).
- Many sftp client improvements, including tab-completion, more options,
and recursive transfer support for get/put (LP: #33378). The old
mget/mput commands never worked properly and have been removed
(closes: #270399, #428082).
- Do not prompt for a passphrase if we fail to open a keyfile, and log
the reason why the open failed to debug (closes: #431538).
- Prevent sftp from crashing when given a "-" without a command. Also,
allow whitespace to follow a "-" (closes: #531561).
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in index 99f2ccb11..f7e05b22e 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.300 2009/08/28 00:47:38 djm Exp $ | 1 | # $Id: Makefile.in,v 1.306 2010/02/24 07:18:51 djm Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -25,6 +25,7 @@ SSH_PROGRAM=@bindir@/ssh | |||
25 | ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass | 25 | ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass |
26 | SFTP_SERVER=$(libexecdir)/sftp-server | 26 | SFTP_SERVER=$(libexecdir)/sftp-server |
27 | SSH_KEYSIGN=$(libexecdir)/ssh-keysign | 27 | SSH_KEYSIGN=$(libexecdir)/ssh-keysign |
28 | SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper | ||
28 | RAND_HELPER=$(libexecdir)/ssh-rand-helper | 29 | RAND_HELPER=$(libexecdir)/ssh-rand-helper |
29 | SSH_DATADIR=$(datadir)/ssh | 30 | SSH_DATADIR=$(datadir)/ssh |
30 | PRIVSEP_PATH=@PRIVSEP_PATH@ | 31 | PRIVSEP_PATH=@PRIVSEP_PATH@ |
@@ -36,6 +37,7 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \ | |||
36 | -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \ | 37 | -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \ |
37 | -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ | 38 | -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ |
38 | -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ | 39 | -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ |
40 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ | ||
39 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ | 41 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ |
40 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \ | 42 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \ |
41 | -DSSH_RAND_HELPER=\"$(RAND_HELPER)\" \ | 43 | -DSSH_RAND_HELPER=\"$(RAND_HELPER)\" \ |
@@ -62,7 +64,7 @@ EXEEXT=@EXEEXT@ | |||
62 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | 64 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ |
63 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ | 65 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ |
64 | 66 | ||
65 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-vulnkey$(EXEEXT) | 67 | 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) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-vulnkey$(EXEEXT) |
66 | 68 | ||
67 | LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | 69 | LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ |
68 | canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ | 70 | canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ |
@@ -72,13 +74,13 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | |||
72 | readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ | 74 | readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ |
73 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ | 75 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ |
74 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ | 76 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ |
75 | kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ | 77 | kexgex.o kexdhc.o kexgexc.o msg.o progressmeter.o dns.o \ |
76 | entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o \ | 78 | entropy.o gss-genr.o umac.o jpake.o schnorr.o \ |
77 | kexgssc.o | 79 | ssh-pkcs11.o kexgssc.o |
78 | 80 | ||
79 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 81 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
80 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ | 82 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ |
81 | roaming_common.o | 83 | roaming_common.o roaming_client.o |
82 | 84 | ||
83 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | 85 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ |
84 | sshpty.o sshlogin.o servconf.o serverloop.o \ | 86 | sshpty.o sshlogin.o servconf.o serverloop.o \ |
@@ -91,10 +93,10 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
91 | auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ | 93 | auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ |
92 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ | 94 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ |
93 | audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ | 95 | audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ |
94 | roaming_common.o | 96 | roaming_common.o roaming_serv.o |
95 | 97 | ||
96 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-vulnkey.1.out sshd_config.5.out ssh_config.5.out | 98 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out ssh-vulnkey.1.out sshd_config.5.out ssh_config.5.out |
97 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-vulnkey.1 sshd_config.5 ssh_config.5 | 99 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 ssh-vulnkey.1 sshd_config.5 ssh_config.5 |
98 | MANTYPE = @MANTYPE@ | 100 | MANTYPE = @MANTYPE@ |
99 | 101 | ||
100 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out | 102 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out |
@@ -150,15 +152,18 @@ scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o | |||
150 | ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o | 152 | ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o |
151 | $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 153 | $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
152 | 154 | ||
153 | ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o | 155 | ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o ssh-pkcs11-client.o |
154 | $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 156 | $(LD) -o $@ ssh-agent.o ssh-pkcs11-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
155 | 157 | ||
156 | ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o | 158 | ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o |
157 | $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 159 | $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
158 | 160 | ||
159 | ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o roaming_dummy.o | 161 | ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o roaming_dummy.o readconf.o |
160 | $(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 162 | $(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
161 | 163 | ||
164 | ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o | ||
165 | $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | ||
166 | |||
162 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o roaming_dummy.o | 167 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o roaming_dummy.o |
163 | $(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) | 168 | $(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) |
164 | 169 | ||
@@ -215,7 +220,6 @@ distclean: regressclean | |||
215 | rm -f survey.sh openbsd-compat/regress/Makefile *~ | 220 | rm -f survey.sh openbsd-compat/regress/Makefile *~ |
216 | rm -rf autom4te.cache | 221 | rm -rf autom4te.cache |
217 | (cd openbsd-compat && $(MAKE) distclean) | 222 | (cd openbsd-compat && $(MAKE) distclean) |
218 | (cd scard && $(MAKE) distclean) | ||
219 | if test -d pkg ; then \ | 223 | if test -d pkg ; then \ |
220 | rm -fr pkg ; \ | 224 | rm -fr pkg ; \ |
221 | fi | 225 | fi |
@@ -238,7 +242,6 @@ catman-do: | |||
238 | distprep: catman-do | 242 | distprep: catman-do |
239 | $(AUTORECONF) | 243 | $(AUTORECONF) |
240 | -rm -rf autom4te.cache | 244 | -rm -rf autom4te.cache |
241 | (cd scard && $(MAKE) -f Makefile.in distprep) | ||
242 | 245 | ||
243 | install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config | 246 | install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config |
244 | install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf | 247 | install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf |
@@ -247,10 +250,7 @@ install-nosysconf: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) insta | |||
247 | check-config: | 250 | check-config: |
248 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config | 251 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config |
249 | 252 | ||
250 | scard-install: | 253 | install-files: |
251 | (cd scard && env DESTDIR=$(DESTDIR) $(MAKE) DESTDIR=$(DESTDIR) install) | ||
252 | |||
253 | install-files: scard-install | ||
254 | $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) | 254 | $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) |
255 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) | 255 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) |
256 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) | 256 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) |
@@ -271,6 +271,7 @@ install-files: scard-install | |||
271 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \ | 271 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \ |
272 | fi | 272 | fi |
273 | $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign $(DESTDIR)$(SSH_KEYSIGN) | 273 | $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign $(DESTDIR)$(SSH_KEYSIGN) |
274 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper $(DESTDIR)$(SSH_PKCS11_HELPER) | ||
274 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp | 275 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp |
275 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER) | 276 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER) |
276 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-vulnkey $(DESTDIR)$(bindir)/ssh-vulnkey | 277 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-vulnkey $(DESTDIR)$(bindir)/ssh-vulnkey |
@@ -291,6 +292,7 @@ install-files: scard-install | |||
291 | $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 | 292 | $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 |
292 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 293 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
293 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 294 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
295 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | ||
294 | $(INSTALL) -m 644 ssh-vulnkey.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-vulnkey.1 | 296 | $(INSTALL) -m 644 ssh-vulnkey.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-vulnkey.1 |
295 | -rm -f $(DESTDIR)$(bindir)/slogin | 297 | -rm -f $(DESTDIR)$(bindir)/slogin |
296 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 298 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
@@ -378,6 +380,7 @@ uninstall: | |||
378 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) | 380 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) |
379 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) | 381 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) |
380 | -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) | 382 | -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) |
383 | -rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) | ||
381 | -rm -f $(DESTDIR)$(RAND_HELPER)$(EXEEXT) | 384 | -rm -f $(DESTDIR)$(RAND_HELPER)$(EXEEXT) |
382 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 385 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
383 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 | 386 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
@@ -391,6 +394,7 @@ uninstall: | |||
391 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 | 394 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 |
392 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 395 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
393 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 396 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
397 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | ||
394 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 398 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
395 | 399 | ||
396 | tests interop-tests: $(TARGETS) | 400 | tests interop-tests: $(TARGETS) |
@@ -404,6 +408,7 @@ tests interop-tests: $(TARGETS) | |||
404 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ | 408 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ |
405 | TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ | 409 | TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ |
406 | TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ | 410 | TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ |
411 | TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ | ||
407 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ | 412 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ |
408 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ | 413 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ |
409 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | 414 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ |
@@ -424,6 +429,7 @@ tests interop-tests: $(TARGETS) | |||
424 | TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ | 429 | TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ |
425 | TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \ | 430 | TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \ |
426 | TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \ | 431 | TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \ |
432 | TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ | ||
427 | TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ | 433 | TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ |
428 | TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ | 434 | TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ |
429 | TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ | 435 | TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ |