summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--regress/dhgex.sh3
-rw-r--r--regress/putty-ciphers.sh4
-rw-r--r--regress/ssh-com.sh4
3 files changed, 5 insertions, 6 deletions
diff --git a/regress/dhgex.sh b/regress/dhgex.sh
index e7c573397..61fc178e8 100644
--- a/regress/dhgex.sh
+++ b/regress/dhgex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: dhgex.sh,v 1.3 2015/10/23 02:22:01 dtucker Exp $ 1# $OpenBSD: dhgex.sh,v 1.4 2017/05/08 01:52:49 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="dhgex" 4tid="dhgex"
@@ -54,7 +54,6 @@ check()
54 54
55#check 2048 3des-cbc 55#check 2048 3des-cbc
56check 3072 `${SSH} -Q cipher | grep 128` 56check 3072 `${SSH} -Q cipher | grep 128`
57check 3072 arcfour blowfish-cbc
58check 7680 `${SSH} -Q cipher | grep 192` 57check 7680 `${SSH} -Q cipher | grep 192`
59check 8192 `${SSH} -Q cipher | grep 256` 58check 8192 `${SSH} -Q cipher | grep 256`
60check 8192 rijndael-cbc@lysator.liu.se chacha20-poly1305@openssh.com 59check 8192 rijndael-cbc@lysator.liu.se chacha20-poly1305@openssh.com
diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh
index 9adba674e..419daabba 100644
--- a/regress/putty-ciphers.sh
+++ b/regress/putty-ciphers.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: putty-ciphers.sh,v 1.5 2016/11/25 03:02:01 dtucker Exp $ 1# $OpenBSD: putty-ciphers.sh,v 1.6 2017/05/08 01:52:49 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="putty ciphers" 4tid="putty ciphers"
@@ -8,7 +8,7 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
8 exit 0 8 exit 0
9fi 9fi
10 10
11for c in aes blowfish 3des arcfour aes128-ctr aes192-ctr aes256-ctr ; do 11for c in aes 3des aes128-ctr aes192-ctr aes256-ctr ; do
12 verbose "$tid: cipher $c" 12 verbose "$tid: cipher $c"
13 cp ${OBJ}/.putty/sessions/localhost_proxy \ 13 cp ${OBJ}/.putty/sessions/localhost_proxy \
14 ${OBJ}/.putty/sessions/cipher_$c 14 ${OBJ}/.putty/sessions/cipher_$c
diff --git a/regress/ssh-com.sh b/regress/ssh-com.sh
index 4371d5279..b1a2505d1 100644
--- a/regress/ssh-com.sh
+++ b/regress/ssh-com.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: ssh-com.sh,v 1.9 2015/05/08 07:29:00 djm Exp $ 1# $OpenBSD: ssh-com.sh,v 1.10 2017/05/08 01:52:49 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="connect to ssh.com server" 4tid="connect to ssh.com server"
@@ -87,7 +87,7 @@ for v in ${VERSIONS}; do
87 fail "ssh connect to sshd2 ${v} failed" 87 fail "ssh connect to sshd2 ${v} failed"
88 fi 88 fi
89 89
90 ciphers="3des-cbc blowfish-cbc arcfour" 90 ciphers="3des-cbc"
91 macs="hmac-md5" 91 macs="hmac-md5"
92 case $v in 92 case $v in
93 2.4.*) 93 2.4.*)