diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2021-09-01 03:16:07 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2021-09-01 03:16:07 +0000 |
| commit | 06374221640b1e7d8dfc8c206f5e163014690835 (patch) | |
| tree | 53789d14c8c636fba1b6aac96889f4ff87ab8559 /regress/usr.bin | |
| parent | d277796d2d9ace2ccce4a9973e73d08004174300 (diff) | |
Fix ssh-rsa fallback for old PuTTY interop tests.
Diffstat (limited to 'regress/usr.bin')
| -rw-r--r-- | regress/usr.bin/ssh/putty-ciphers.sh | 5 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/putty-kex.sh | 5 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/putty-transfer.sh | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/regress/usr.bin/ssh/putty-ciphers.sh b/regress/usr.bin/ssh/putty-ciphers.sh index f2819ab8c49..5b8e25a2719 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.10 2021/09/01 00:50:27 dtucker Exp $ +# $OpenBSD: putty-ciphers.sh,v 1.11 2021/09/01 03:16:06 dtucker Exp $ # Placed in the Public Domain. tid="putty ciphers" @@ -10,7 +10,8 @@ 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 + echo "HostKeyAlgorithms +ssh-rsa" >> ${OBJ}/sshd_proxy + echo "PubkeyAcceptedKeyTypes +ssh-rsa" >> ${OBJ}/sshd_proxy fi for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do diff --git a/regress/usr.bin/ssh/putty-kex.sh b/regress/usr.bin/ssh/putty-kex.sh index c4268524feb..c75802a0610 100644 --- a/regress/usr.bin/ssh/putty-kex.sh +++ b/regress/usr.bin/ssh/putty-kex.sh @@ -1,4 +1,4 @@ -# $OpenBSD: putty-kex.sh,v 1.8 2021/09/01 00:50:27 dtucker Exp $ +# $OpenBSD: putty-kex.sh,v 1.9 2021/09/01 03:16:06 dtucker Exp $ # Placed in the Public Domain. tid="putty KEX" @@ -10,7 +10,8 @@ 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 + echo "HostKeyAlgorithms +ssh-rsa" >> ${OBJ}/sshd_proxy + echo "PubkeyAcceptedKeyTypes +ssh-rsa" >> ${OBJ}/sshd_proxy fi for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do diff --git a/regress/usr.bin/ssh/putty-transfer.sh b/regress/usr.bin/ssh/putty-transfer.sh index aaf5a9e444f..a6864f9515a 100644 --- a/regress/usr.bin/ssh/putty-transfer.sh +++ b/regress/usr.bin/ssh/putty-transfer.sh @@ -1,4 +1,4 @@ -# $OpenBSD: putty-transfer.sh,v 1.10 2021/09/01 00:50:27 dtucker Exp $ +# $OpenBSD: putty-transfer.sh,v 1.11 2021/09/01 03:16:06 dtucker Exp $ # Placed in the Public Domain. tid="putty transfer data" @@ -10,7 +10,8 @@ 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 + echo "HostKeyAlgorithms +ssh-rsa" >> ${OBJ}/sshd_proxy + echo "PubkeyAcceptedKeyTypes +ssh-rsa" >> ${OBJ}/sshd_proxy fi if [ "`${SSH} -Q compression`" = "none" ]; then |