remove SSH1 make flag and associated files

ok markus@

diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
index 07bef08..b74e9d6 100644 (file)
--- 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 2c85d52..316cf2e 100644 (file)
--- 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 c3a925c..52c4dbd 100644 (file)
--- 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")