diff options
| author |   djm <djm@openbsd.org> | 2017-04-30 23:17:37 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-04-30 23:17:37 +0000 |
| commit | 6c99a5ed578d2ff519b76d46c1b462cfac1880d1 (patch) | |
| tree | e78349f1048c6d9ef25e9551f0021ec8082e0c6f | |
| parent | remove SSHv1 ciphers; ok markus@ (diff) | |
| download | wireguard-openbsd-6c99a5ed578d2ff519b76d46c1b462cfac1880d1.tar.xz wireguard-openbsd-6c99a5ed578d2ff519b76d46c1b462cfac1880d1.zip | |
remove SSH1 make flag and associated files
ok markus@
| -rw-r--r-- | usr.bin/ssh/Makefile.inc | 9 | ||||
| -rw-r--r-- | usr.bin/ssh/lib/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh/Makefile | 6 |
3 files changed, 3 insertions, 18 deletions
diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc index 07bef088d64..b74e9d6c8fe 100644 --- a/usr.bin/ssh/Makefile.inc +++ b/usr.bin/ssh/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.52 2017/04/30 23:10:43 djm Exp $ +# $OpenBSD: Makefile.inc,v 1.53 2017/04/30 23:17:37 djm Exp $ .include <bsd.own.mk> @@ -35,13 +35,6 @@ OPENSSL?= yes .if (${OPENSSL:L} == "yes") CFLAGS+= -DWITH_OPENSSL -.else -# SSH v.1 requires OpenSSL. -SSH1= no -.endif - -.if (${SSH1:L} == "yes") -CFLAGS+= -DWITH_SSH1 .endif CFLAGS+= -DENABLE_PKCS11 diff --git a/usr.bin/ssh/lib/Makefile b/usr.bin/ssh/lib/Makefile index 2c85d528b8f..316cf2e8943 100644 --- a/usr.bin/ssh/lib/Makefile +++ b/usr.bin/ssh/lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.86 2016/07/04 18:01:44 guenther Exp $ +# $OpenBSD: Makefile,v 1.87 2017/04/30 23:17:37 djm Exp $ .PATH: ${.CURDIR}/.. .include "${.CURDIR}/../Makefile.inc" @@ -35,10 +35,6 @@ SRCS= ${LIB_SRCS} \ kexc25519.c kexc25519c.c kexc25519s.c \ chacha.c poly1305.c cipher-chachapoly.c ssh-ed25519.c hmac.c umac.c -.if (${SSH1:L} == "yes") -SRCS+= cipher-3des1.c cipher-bf1.c -.endif - .if (${OPENSSL:L} == "yes") SRCS+= bufec.c bufbn.c rsa.c \ ssh-dss.c ssh-rsa.c ssh-ecdsa.c dh.c \ diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index c3a925c7e43..52c4dbd577b 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.66 2016/01/14 16:17:40 markus Exp $ +# $OpenBSD: Makefile,v 1.67 2017/04/30 23:17:37 djm Exp $ .PATH: ${.CURDIR}/.. .include "${.CURDIR}/../Makefile.inc" @@ -16,10 +16,6 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ .include <bsd.own.mk> -.if (${SSH1:L} == "yes") -SRCS+= sshconnect1.c -.endif - KERBEROS5=no .if (${KERBEROS5:L} == "yes") |