upstream: Fix ssh-rsa fallback for old PuTTY interop tests.

OpenBSD-Regress-ID: a19ac929da604843a5b5f0f48d2c0eb6e0773d37

diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh
index f2819ab8c490a5ee629e7707ab459f5428cc5646..5b8e25a27199f47eb2d9a1d0f1dd7e33e483c413 100644 (file)
--- a/regress/putty-ciphers.sh
+++ b/regress/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/putty-kex.sh b/regress/putty-kex.sh
index c4268524febf404c7bb88a2a22a3c692ba23ed96..c75802a06103207fe169a89f3015b72442f92ab5 100644 (file)
--- a/regress/putty-kex.sh
+++ b/regress/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/putty-transfer.sh b/regress/putty-transfer.sh
index aaf5a9e444fa2fb5e518771ae10db805e255fa43..a6864f9515a73961e5db504ec57b1221026e0677 100644 (file)
--- a/regress/putty-transfer.sh
+++ b/regress/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