summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2017-05-08 01:52:49 +0000
committerdjm <djm@openbsd.org>2017-05-08 01:52:49 +0000
commit07a9af8bf69bb70e026e555d407a481d2cebb7e1 (patch)
tree3e01facd32ef167e8935f04d7ffe37fede334499
parentadd a BUS_DMA_64BIT flag to bus_dma on all our archs. (diff)
downloadwireguard-openbsd-07a9af8bf69bb70e026e555d407a481d2cebb7e1.tar.xz
wireguard-openbsd-07a9af8bf69bb70e026e555d407a481d2cebb7e1.zip
remove arcfour, blowfish and CAST here too
-rw-r--r--regress/usr.bin/ssh/dhgex.sh3
-rw-r--r--regress/usr.bin/ssh/putty-ciphers.sh4
-rw-r--r--regress/usr.bin/ssh/ssh-com.sh4
3 files changed, 5 insertions, 6 deletions
diff --git a/regress/usr.bin/ssh/dhgex.sh b/regress/usr.bin/ssh/dhgex.sh
index e7c5733974a..61fc178e890 100644
--- a/regress/usr.bin/ssh/dhgex.sh
+++ b/regress/usr.bin/ssh/dhgex.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: dhgex.sh,v 1.3 2015/10/23 02:22:01 dtucker Exp $
+# $OpenBSD: dhgex.sh,v 1.4 2017/05/08 01:52:49 djm Exp $
# Placed in the Public Domain.
tid="dhgex"
@@ -54,7 +54,6 @@ check()
#check 2048 3des-cbc
check 3072 `${SSH} -Q cipher | grep 128`
-check 3072 arcfour blowfish-cbc
check 7680 `${SSH} -Q cipher | grep 192`
check 8192 `${SSH} -Q cipher | grep 256`
check 8192 rijndael-cbc@lysator.liu.se chacha20-poly1305@openssh.com
diff --git a/regress/usr.bin/ssh/putty-ciphers.sh b/regress/usr.bin/ssh/putty-ciphers.sh
index 376e1de1bc9..df272e04d66 100644
--- a/regress/usr.bin/ssh/putty-ciphers.sh
+++ b/regress/usr.bin/ssh/putty-ciphers.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: putty-ciphers.sh,v 1.5 2016/11/25 03:02:01 dtucker Exp $
+# $OpenBSD: putty-ciphers.sh,v 1.6 2017/05/08 01:52:49 djm Exp $
# Placed in the Public Domain.
tid="putty ciphers"
@@ -7,7 +7,7 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
fatal "putty interop tests not enabled"
fi
-for c in aes blowfish 3des arcfour aes128-ctr aes192-ctr aes256-ctr ; do
+for c in aes 3des aes128-ctr aes192-ctr aes256-ctr ; do
verbose "$tid: cipher $c"
cp ${OBJ}/.putty/sessions/localhost_proxy \
${OBJ}/.putty/sessions/cipher_$c
diff --git a/regress/usr.bin/ssh/ssh-com.sh b/regress/usr.bin/ssh/ssh-com.sh
index 4371d527974..b1a2505d113 100644
--- a/regress/usr.bin/ssh/ssh-com.sh
+++ b/regress/usr.bin/ssh/ssh-com.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: ssh-com.sh,v 1.9 2015/05/08 07:29:00 djm Exp $
+# $OpenBSD: ssh-com.sh,v 1.10 2017/05/08 01:52:49 djm Exp $
# Placed in the Public Domain.
tid="connect to ssh.com server"
@@ -87,7 +87,7 @@ for v in ${VERSIONS}; do
fail "ssh connect to sshd2 ${v} failed"
fi
- ciphers="3des-cbc blowfish-cbc arcfour"
+ ciphers="3des-cbc"
macs="hmac-md5"
case $v in
2.4.*)