[openssh-commits] [openssh] 01/01: upstream: Fix ssh-rsa fallback for old PuTTY interop tests.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit cb37e2f0c0ca4fef844ed7edc5d0e3b7d0e83f6a
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Wed Sep 1 03:16:06 2021 +0000

    upstream: Fix ssh-rsa fallback for old PuTTY interop tests.
    
    OpenBSD-Regress-ID: a19ac929da604843a5b5f0f48d2c0eb6e0773d37
---
 regress/putty-ciphers.sh  | 5 +++--
 regress/putty-kex.sh      | 5 +++--
 regress/putty-transfer.sh | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh
index f2819ab8..5b8e25a2 100644
--- 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 c4268524..c75802a0 100644
--- 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 aaf5a9e4..a6864f95 100644
--- 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.