diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-09 23:45:24 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-09 23:47:26 +0000 |
commit | d62fa90d496ae9532d8c1426b177e12d3c5ac03b (patch) | |
tree | 3179fea9631a318c8a0782dedc7cd690f201af69 /Makefile.in | |
parent | d26565af8589d88f824b26f31da493f1056efcf4 (diff) | |
parent | b65a0ded7a8cfe7d351e28266d7851216d679e05 (diff) |
Drop ssh-vulnkey
Drop ssh-vulnkey and the associated ssh/ssh-add/sshd integration
code, leaving only basic configuration file compatibility, since it
has been nearly six years since the original vulnerability and this
code is not likely to be of much value any more. See
https://lists.debian.org/debian-devel/2013/09/msg00240.html for my
full reasoning.
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index 839abbd48..095f4ff32 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -26,7 +26,6 @@ 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 | SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper |
29 | SSH_DATADIR=$(datadir)/ssh | ||
30 | PRIVSEP_PATH=@PRIVSEP_PATH@ | 29 | PRIVSEP_PATH=@PRIVSEP_PATH@ |
31 | SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ | 30 | SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ |
32 | STRIP_OPT=@STRIP_OPT@ | 31 | STRIP_OPT=@STRIP_OPT@ |
@@ -38,8 +37,7 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \ | |||
38 | -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ | 37 | -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ |
39 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ | 38 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ |
40 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ | 39 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ |
41 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \ | 40 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" |
42 | -D_PATH_SSH_DATADIR=\"$(SSH_DATADIR)\" | ||
43 | 41 | ||
44 | CC=@CC@ | 42 | CC=@CC@ |
45 | LD=@LD@ | 43 | LD=@LD@ |
@@ -63,7 +61,7 @@ LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ | |||
63 | EXEEXT=@EXEEXT@ | 61 | EXEEXT=@EXEEXT@ |
64 | MANFMT=@MANFMT@ | 62 | MANFMT=@MANFMT@ |
65 | 63 | ||
66 | 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-vulnkey$(EXEEXT) | 64 | 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) |
67 | 65 | ||
68 | LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | 66 | LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \ |
69 | canohost.o channels.o cipher.o cipher-aes.o \ | 67 | canohost.o channels.o cipher.o cipher-aes.o \ |
@@ -99,8 +97,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
99 | sandbox-seccomp-filter.o \ | 97 | sandbox-seccomp-filter.o \ |
100 | consolekit.o | 98 | consolekit.o |
101 | 99 | ||
102 | 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-keysign.8.out ssh-pkcs11-helper.8.out ssh-vulnkey.1.out sshd_config.5.out ssh_config.5.out | 100 | 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-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out |
103 | 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-keysign.8 ssh-pkcs11-helper.8 ssh-vulnkey.1 sshd_config.5 ssh_config.5 | 101 | 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-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 |
104 | MANTYPE = @MANTYPE@ | 102 | MANTYPE = @MANTYPE@ |
105 | 103 | ||
106 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out | 104 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out |
@@ -179,9 +177,6 @@ sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o s | |||
179 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o | 177 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o |
180 | $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) | 178 | $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) |
181 | 179 | ||
182 | ssh-vulnkey$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-vulnkey.o | ||
183 | $(LD) -o $@ ssh-vulnkey.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | ||
184 | |||
185 | # test driver for the loginrec code - not built by default | 180 | # test driver for the loginrec code - not built by default |
186 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o | 181 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o |
187 | $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) | 182 | $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) |
@@ -278,7 +273,6 @@ install-files: | |||
278 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) | 273 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) |
279 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT) | 274 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT) |
280 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) | 275 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) |
281 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-vulnkey$(EXEEXT) $(DESTDIR)$(bindir)/ssh-vulnkey$(EXEEXT) | ||
282 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 276 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
283 | $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 | 277 | $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
284 | $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 | 278 | $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 |
@@ -294,7 +288,6 @@ install-files: | |||
294 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 288 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
295 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 289 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
296 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 290 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
297 | $(INSTALL) -m 644 ssh-vulnkey.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-vulnkey.1 | ||
298 | -rm -f $(DESTDIR)$(bindir)/slogin | 291 | -rm -f $(DESTDIR)$(bindir)/slogin |
299 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 292 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
300 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 293 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
@@ -376,7 +369,6 @@ uninstall: | |||
376 | -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) | 369 | -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) |
377 | -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) | 370 | -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) |
378 | -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) | 371 | -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) |
379 | -rm -f $(DESTDIR)$(bindir)/ssh-vulnkey$(EXEEXT) | ||
380 | -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) | 372 | -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) |
381 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) | 373 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) |
382 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) | 374 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) |
@@ -389,7 +381,6 @@ uninstall: | |||
389 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 | 381 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 |
390 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 | 382 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 |
391 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 | 383 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 |
392 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-vulnkey.1 | ||
393 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 | 384 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 |
394 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 385 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
395 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 386 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |