upstream commit

remove arcfour, blowfish and CAST here too

Upstream-Regress-ID: c613b3bcbef75df1fe84ca4dc2d3ef253dc5e920
This commit is contained in:
djm@openbsd.org 2017-05-08 01:52:49 +00:00 committed by Damien Miller
parent 7461a5bc57
commit effaf526bf
3 changed files with 5 additions and 6 deletions

View File

@ -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

View File

@ -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"
@ -8,7 +8,7 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
exit 0
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

View File

@ -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.*)