Attachment 2891 Details for Bug 2639 – Fix PuTTY interop tests

[patch] Fix PuTTY interop tests

0001-Fix-PuTTY-interop-tests.patch (text/plain), 4.32 KB, created by Colin Watson on 2016-11-20 02:57:36 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Watson

Created: 2016-11-20 02:57:36 AEDT

Size: 4.32 KB

patch

obsolete

>From 3e531dfac16f2b7faba8ed71bf2d3b04ea7f6693 Mon Sep 17 00:00:00 2001
>From: Colin Watson <cjwatson@debian.org>
>Date: Sat, 19 Nov 2016 15:45:51 +0000
>Subject: [PATCH] Fix PuTTY interop tests
>
>A while back I got a patch into PuTTY (although it hasn't yet made it
>into an upstream release) to add passphrase-file options to puttygen.
>Use these to make the PuTTY interop tests non-interactive.
>
>Fix up a few details of the saved session.
>
>When plink is given a saved session name, it expects that *instead* of
>the host name (or IP address), not in addition to it.  Drop "127.0.0.1"
>from the various plink test command lines.
>
>(It is possible that the last two of these represent compatibility
>breaks of some kind; but if they are, then that ship sailed sufficiently
>long ago - at least seven years, possibly more - that it's no longer
>worth worrying about it.  It's more useful to test interoperability with
>current versions.)
>---
> regress/putty-ciphers.sh  |  2 +-
> regress/putty-kex.sh      |  3 +--
> regress/putty-transfer.sh |  4 ++--
> regress/test-exec.sh      | 10 ++++++++--
> 4 files changed, 12 insertions(+), 7 deletions(-)
>
>diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh
>index 724a98c..3775b1d 100644
>--- a/regress/putty-ciphers.sh
>+++ b/regress/putty-ciphers.sh
>@@ -16,7 +16,7 @@ for c in aes blowfish 3des arcfour aes128-ctr aes192-ctr aes256-ctr ; do
> 
> 	rm -f ${COPY}
> 	env HOME=$PWD ${PLINK} -load cipher_$c -batch -i putty.rsa2 \
>-	    127.0.0.1 cat ${DATA} > ${COPY}
>+	    cat ${DATA} > ${COPY}
> 	if [ $? -ne 0 ]; then
> 		fail "ssh cat $DATA failed"
> 	fi
>diff --git a/regress/putty-kex.sh b/regress/putty-kex.sh
>index 1844d65..6ae2290 100644
>--- a/regress/putty-kex.sh
>+++ b/regress/putty-kex.sh
>@@ -14,8 +14,7 @@ for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; do
> 	    ${OBJ}/.putty/sessions/kex_$k
> 	echo "KEX=$k" >> ${OBJ}/.putty/sessions/kex_$k
> 
>-	env HOME=$PWD ${PLINK} -load kex_$k -batch -i putty.rsa2 \
>-	    127.0.0.1 true
>+	env HOME=$PWD ${PLINK} -load kex_$k -batch -i putty.rsa2 true
> 	if [ $? -ne 0 ]; then
> 		fail "KEX $k failed"
> 	fi
>diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh
>index aec0e04..cb1da94 100644
>--- a/regress/putty-transfer.sh
>+++ b/regress/putty-transfer.sh
>@@ -17,7 +17,7 @@ for p in 2; do
> 		    ${OBJ}/.putty/sessions/compression_$c
> 		echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k
> 		env HOME=$PWD ${PLINK} -load compression_$c -batch \
>-		    -i putty.rsa$p 127.0.0.1 cat ${DATA} > ${COPY}
>+		    -i putty.rsa$p cat ${DATA} > ${COPY}
> 		if [ $? -ne 0 ]; then
> 			fail "ssh cat $DATA failed"
> 		fi
>@@ -28,7 +28,7 @@ for p in 2; do
> 			rm -f ${COPY}
> 			dd if=$DATA obs=${s} 2> /dev/null | \
> 				env HOME=$PWD ${PLINK} -load compression_$c \
>-				    -batch -i putty.rsa$p 127.0.0.1 \
>+				    -batch -i putty.rsa$p \
> 				    "cat > ${COPY}"
> 			if [ $? -ne 0 ]; then
> 				fail "ssh cat $DATA failed"
>diff --git a/regress/test-exec.sh b/regress/test-exec.sh
>index 7a456bb..5422c8b 100644
>--- a/regress/test-exec.sh
>+++ b/regress/test-exec.sh
>@@ -512,7 +512,11 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
> 
> 	# Add a PuTTY key to authorized_keys
> 	rm -f ${OBJ}/putty.rsa2
>-	puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null
>+	if ! puttygen -t rsa -o ${OBJ}/putty.rsa2 \
>+	    --new-passphrase /dev/null < /dev/null > /dev/null; then
>+		echo "Your installed version of PuTTY is too old to support --new-passphrase; trying without (may require manual interaction) ..." >&2
>+		puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null
>+	fi
> 	puttygen -O public-openssh ${OBJ}/putty.rsa2 \
> 	    >> $OBJ/authorized_keys_$USER
> 
>@@ -525,10 +529,12 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
> 	# Setup proxied session
> 	mkdir -p ${OBJ}/.putty/sessions
> 	rm -f ${OBJ}/.putty/sessions/localhost_proxy
>-	echo "Hostname=127.0.0.1" >> ${OBJ}/.putty/sessions/localhost_proxy
>+	echo "Protocol=ssh" >> ${OBJ}/.putty/sessions/localhost_proxy
>+	echo "HostName=127.0.0.1" >> ${OBJ}/.putty/sessions/localhost_proxy
> 	echo "PortNumber=$PORT" >> ${OBJ}/.putty/sessions/localhost_proxy
> 	echo "ProxyMethod=5" >> ${OBJ}/.putty/sessions/localhost_proxy
> 	echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy
>+	echo "ProxyLocalhost=1" >> ${OBJ}/.putty/sessions/localhost_proxy
> 
> 	REGRESS_INTEROP_PUTTY=yes
> fi
>-- 
>2.7.4
>

Actions: View | Diff

Attachments on bug 2639: 2891