tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Better compat tests with old PuTTY. 

When running PuTTY interop tests and using a PuTTY version older than
0.76, re-enable the ssh-rsa host key algorithm (the 256 and 512 variants
of RSA were added some time between 0.73 and 0.76).

OpenBSD-Regress-ID: e6138d6987aa705fa1e4f216db0bb386e1ff38e1
This commit is contained in:
dtucker@openbsd.org 2021-08-31 06:13:23 +00:00 committed by Darren Tucker
parent 87ad70d605
commit d22b299115
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
regress/putty-ciphers.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: putty-ciphers.sh,v 1.7 2020/01/23 03:35:07 dtucker Exp $ # $OpenBSD: putty-ciphers.sh,v 1.8 2021/08/31 06:13:23 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="putty ciphers" tid="putty ciphers"
@ -7,6 +7,12 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
fatal "putty interop tests not enabled" fatal "putty interop tests not enabled"
fi fi
# Re-enable ssh-rsa on older PuTTY versions.
oldver="`${PLINK} --version | awk '/plink: Release/{if ($3<0.76)print "yes"}'`"
if [ "x$oldver" = "xyes" ]; then
echo "HostKeyalgorithms +ssh-rsa" >> sshd_config
fi
for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do
verbose "$tid: cipher $c" verbose "$tid: cipher $c"
cp ${OBJ}/.putty/sessions/localhost_proxy \ cp ${OBJ}/.putty/sessions/localhost_proxy \

8
regress/putty-kex.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: putty-kex.sh,v 1.5 2020/01/23 03:24:38 dtucker Exp $ # $OpenBSD: putty-kex.sh,v 1.6 2021/08/31 06:13:23 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="putty KEX" tid="putty KEX"
@ -7,6 +7,12 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
fatal "putty interop tests not enabled" fatal "putty interop tests not enabled"
fi fi
# Re-enable ssh-rsa on older PuTTY versions.
oldver="`${PLINK} --version | awk '/plink: Release/{if ($3<0.76)print "yes"}'`"
if [ "x$oldver" = "xyes" ]; then
echo "HostKeyalgorithms +ssh-rsa" >> sshd_config
fi
for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do
verbose "$tid: kex $k" verbose "$tid: kex $k"
cp ${OBJ}/.putty/sessions/localhost_proxy \ cp ${OBJ}/.putty/sessions/localhost_proxy \

8
regress/putty-transfer.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: putty-transfer.sh,v 1.7 2020/01/23 11:19:12 dtucker Exp $ # $OpenBSD: putty-transfer.sh,v 1.8 2021/08/31 06:13:23 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="putty transfer data" tid="putty transfer data"
@ -7,6 +7,12 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
fatal "putty interop tests not enabled" fatal "putty interop tests not enabled"
fi fi
# Re-enable ssh-rsa on older PuTTY versions.
oldver="`${PLINK} --version | awk '/plink: Release/{if ($3<0.76)print "yes"}'`"
if [ "x$oldver" = "xyes" ]; then
echo "HostKeyalgorithms +ssh-rsa" >> sshd_config
fi
if [ "`${SSH} -Q compression`" = "none" ]; then if [ "`${SSH} -Q compression`" = "none" ]; then
comp="0" comp="0"
else else