diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-05-08 01:52:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 11:54:17 +1000 |
commit | effaf526bfa57c0ac9056ca236becf52385ce8af (patch) | |
tree | d06677e689084abb41f11973e40e6992bae8f132 /regress | |
parent | 7461a5bc571696273252df28a1f1578968cae506 (diff) |
upstream commit
remove arcfour, blowfish and CAST here too
Upstream-Regress-ID: c613b3bcbef75df1fe84ca4dc2d3ef253dc5e920
Diffstat (limited to 'regress')
-rw-r--r-- | regress/dhgex.sh | 3 | ||||
-rw-r--r-- | regress/putty-ciphers.sh | 4 | ||||
-rw-r--r-- | regress/ssh-com.sh | 4 |
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 | ||
4 | tid="dhgex" | 4 | tid="dhgex" |
@@ -54,7 +54,6 @@ check() | |||
54 | 54 | ||
55 | #check 2048 3des-cbc | 55 | #check 2048 3des-cbc |
56 | check 3072 `${SSH} -Q cipher | grep 128` | 56 | check 3072 `${SSH} -Q cipher | grep 128` |
57 | check 3072 arcfour blowfish-cbc | ||
58 | check 7680 `${SSH} -Q cipher | grep 192` | 57 | check 7680 `${SSH} -Q cipher | grep 192` |
59 | check 8192 `${SSH} -Q cipher | grep 256` | 58 | check 8192 `${SSH} -Q cipher | grep 256` |
60 | check 8192 rijndael-cbc@lysator.liu.se chacha20-poly1305@openssh.com | 59 | check 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 | ||
4 | tid="putty ciphers" | 4 | tid="putty ciphers" |
@@ -8,7 +8,7 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then | |||
8 | exit 0 | 8 | exit 0 |
9 | fi | 9 | fi |
10 | 10 | ||
11 | for c in aes blowfish 3des arcfour aes128-ctr aes192-ctr aes256-ctr ; do | 11 | for 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 | ||
4 | tid="connect to ssh.com server" | 4 | tid="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.*) |