Attachment #2891 for bug #2639

View | Details | Raw Unified | Return to bug 2639
Collapse All | Expand All

Lines 16-22 for c in aes blowfish 3des arcfour aes128-ctr aes192-ctr aes256-ctr ; do Link Here

(-)a/regress/putty-ciphers.sh (-1 / +1 lines)
16		16
17	rm -f ${COPY}	17	rm -f ${COPY}
18	env HOME=$PWD ${PLINK} -load cipher_$c -batch -i putty.rsa2 \	18	env HOME=$PWD ${PLINK} -load cipher_$c -batch -i putty.rsa2 \
19	127.0.0.1 cat ${DATA} > ${COPY}	19	cat ${DATA} > ${COPY}
20	if [ $? -ne 0 ]; then	20	if [ $? -ne 0 ]; then
21	fail "ssh cat $DATA failed"	21	fail "ssh cat $DATA failed"
22	fi	22	fi

Lines 14-21 for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; do Link Here

(-)a/regress/putty-kex.sh (-2 / +1 lines)
14	${OBJ}/.putty/sessions/kex_$k	14	${OBJ}/.putty/sessions/kex_$k
15	echo "KEX=$k" >> ${OBJ}/.putty/sessions/kex_$k	15	echo "KEX=$k" >> ${OBJ}/.putty/sessions/kex_$k
16		16
17	env HOME=$PWD ${PLINK} -load kex_$k -batch -i putty.rsa2 \	17	env HOME=$PWD ${PLINK} -load kex_$k -batch -i putty.rsa2 true
18	127.0.0.1 true
19	if [ $? -ne 0 ]; then	18	if [ $? -ne 0 ]; then
20	fail "KEX $k failed"	19	fail "KEX $k failed"
21	fi	20	fi

Lines 17-23 for p in 2; do Link Here

(-)a/regress/putty-transfer.sh (-2 / +2 lines)
17	${OBJ}/.putty/sessions/compression_$c	17	${OBJ}/.putty/sessions/compression_$c
18	echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k	18	echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k
19	env HOME=$PWD ${PLINK} -load compression_$c -batch \	19	env HOME=$PWD ${PLINK} -load compression_$c -batch \
20	-i putty.rsa$p 127.0.0.1 cat ${DATA} > ${COPY}	20	-i putty.rsa$p cat ${DATA} > ${COPY}
21	if [ $? -ne 0 ]; then	21	if [ $? -ne 0 ]; then
22	fail "ssh cat $DATA failed"	22	fail "ssh cat $DATA failed"
23	fi	23	fi
Lines 28-34 for p in 2; do Link Here
28	rm -f ${COPY}	28	rm -f ${COPY}
29	dd if=$DATA obs=${s} 2> /dev/null \| \	29	dd if=$DATA obs=${s} 2> /dev/null \| \
30	env HOME=$PWD ${PLINK} -load compression_$c \	30	env HOME=$PWD ${PLINK} -load compression_$c \
31	-batch -i putty.rsa$p 127.0.0.1 \	31	-batch -i putty.rsa$p \
32	"cat > ${COPY}"	32	"cat > ${COPY}"
33	if [ $? -ne 0 ]; then	33	if [ $? -ne 0 ]; then
34	fail "ssh cat $DATA failed"	34	fail "ssh cat $DATA failed"





	# Add a PuTTY key to authorized_keys
	rm -f ${OBJ}/putty.rsa2
	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


	# Setup proxied session
	mkdir -p ${OBJ}/.putty/sessions
	rm -f ${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
- 

Return to bug 2639

Lines 512-518 if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then Link Here

(-)a/regress/test-exec.sh (-3 / +8 lines)
512		512
513	# Add a PuTTY key to authorized_keys	513	# Add a PuTTY key to authorized_keys
514	rm -f ${OBJ}/putty.rsa2	514	rm -f ${OBJ}/putty.rsa2
515	puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null	515	if ! puttygen -t rsa -o ${OBJ}/putty.rsa2 \
		516	--new-passphrase /dev/null < /dev/null > /dev/null; then
		517	echo "Your installed version of PuTTY is too old to support --new-passphrase; trying without (may require manual interaction) ..." >&2
		518	puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null
		519	fi
516	puttygen -O public-openssh ${OBJ}/putty.rsa2 \	520	puttygen -O public-openssh ${OBJ}/putty.rsa2 \
517	>> $OBJ/authorized_keys_$USER	521	>> $OBJ/authorized_keys_$USER
518		522
Lines 525-534 if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then Link Here
525	# Setup proxied session	529	# Setup proxied session
526	mkdir -p ${OBJ}/.putty/sessions	530	mkdir -p ${OBJ}/.putty/sessions
527	rm -f ${OBJ}/.putty/sessions/localhost_proxy	531	rm -f ${OBJ}/.putty/sessions/localhost_proxy
528	echo "Hostname=127.0.0.1" >> ${OBJ}/.putty/sessions/localhost_proxy	532	echo "Protocol=ssh" >> ${OBJ}/.putty/sessions/localhost_proxy
		533	echo "HostName=127.0.0.1" >> ${OBJ}/.putty/sessions/localhost_proxy
529	echo "PortNumber=$PORT" >> ${OBJ}/.putty/sessions/localhost_proxy	534	echo "PortNumber=$PORT" >> ${OBJ}/.putty/sessions/localhost_proxy
530	echo "ProxyMethod=5" >> ${OBJ}/.putty/sessions/localhost_proxy	535	echo "ProxyMethod=5" >> ${OBJ}/.putty/sessions/localhost_proxy
531	echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy	536	echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy
		537	echo "ProxyLocalhost=1" >> ${OBJ}/.putty/sessions/localhost_proxy
532		538
533	REGRESS_INTEROP_PUTTY=yes	539	REGRESS_INTEROP_PUTTY=yes
534	fi	540	fi
535	-