summaryrefslogtreecommitdiffstats
path: root/regress/putty-transfer.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:19:51 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:19:51 +0000
commit19b39815163d510f7ed52bedab507fa72202c15a (patch)
tree30ef0de18a35492922fad0066068ae50ad90a36c /regress/putty-transfer.sh
parentAdding upstream version 1:9.6p1. (diff)
downloadopenssh-19b39815163d510f7ed52bedab507fa72202c15a.tar.xz
openssh-19b39815163d510f7ed52bedab507fa72202c15a.zip
Adding upstream version 1:9.7p1.upstream/1%9.7p1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'regress/putty-transfer.sh')
-rw-r--r--regress/putty-transfer.sh13
1 files changed, 2 insertions, 11 deletions
diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh
index a6864f9..1920f49 100644
--- a/regress/putty-transfer.sh
+++ b/regress/putty-transfer.sh
@@ -1,18 +1,9 @@
-# $OpenBSD: putty-transfer.sh,v 1.11 2021/09/01 03:16:06 dtucker Exp $
+# $OpenBSD: putty-transfer.sh,v 1.12 2024/02/09 08:47:42 dtucker Exp $
# Placed in the Public Domain.
tid="putty transfer data"
-if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
- skip "putty interop tests not enabled"
-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" >> ${OBJ}/sshd_proxy
- echo "PubkeyAcceptedKeyTypes +ssh-rsa" >> ${OBJ}/sshd_proxy
-fi
+puttysetup
if [ "`${SSH} -Q compression`" = "none" ]; then
comp="0"