summaryrefslogtreecommitdiff
path: root/regress/putty-kex.sh
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-11-19 16:02:49 +0000
committerColin Watson <cjwatson@debian.org>2016-11-19 16:03:10 +0000
commit9c88f6248e9da14cb7916527862f2eac7f55b12a (patch)
tree7fe22ed8b89bcfafbbc22173026e8e4eaba2aa33 /regress/putty-kex.sh
parentb139635512b1af75e82252c0c71ac66e08b78774 (diff)
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.) Origin: https://bugzilla.mindrot.org/attachment.cgi?id=2891 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2639 Last-Update: 2016-11-19 Patch-Name: fix-putty-interop-tests.patch
Diffstat (limited to 'regress/putty-kex.sh')
-rw-r--r--regress/putty-kex.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/regress/putty-kex.sh b/regress/putty-kex.sh
index 1844d6599..6ae229005 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
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