From: dtucker <dtucker@openbsd.org>
Date: Wed, 1 Sep 2021 03:16:06 +0000 (+0000)
Subject: Fix ssh-rsa fallback for old PuTTY interop tests.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d20d09d2b0c1e869b120f9ce7305ceca77387787;p=openbsd

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

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