diff options
author | Colin Watson <cjwatson@debian.org> | 2019-06-14 11:57:15 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2019-06-21 16:14:04 +0100 |
commit | 42519a0f32765726ccd18a14aa6e877413a69662 (patch) | |
tree | 642512cd53f5497970975071d30d4ac9bb63c45e /regress/conch-ciphers.sh | |
parent | d38283cc4cba6bf7685a16898a3b9d3a6cecf661 (diff) |
Fix interop tests for recent regress changes
A recent regress change (2a9b3a2ce411d16cda9c79ab713c55f65b0ec257 in
portable) broke the PuTTY and Twisted Conch interop tests, because the
key they want to use is now called ssh-rsa rather than rsa. Fix them.
Forwarded: https://bugzilla.mindrot.org/show_bug.cgi?id=3020
Last-Update: 2019-06-14
Patch-Name: fix-interop-tests.patch
Diffstat (limited to 'regress/conch-ciphers.sh')
-rw-r--r-- | regress/conch-ciphers.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh index 199d863a0..51e3b705f 100644 --- a/regress/conch-ciphers.sh +++ b/regress/conch-ciphers.sh | |||
@@ -16,7 +16,7 @@ for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \ | |||
16 | rm -f ${COPY} | 16 | rm -f ${COPY} |
17 | # XXX the 2nd "cat" seems to be needed because of buggy FD handling | 17 | # XXX the 2nd "cat" seems to be needed because of buggy FD handling |
18 | # in conch | 18 | # in conch |
19 | ${CONCH} --identity $OBJ/rsa --port $PORT --user $USER -e none \ | 19 | ${CONCH} --identity $OBJ/ssh-rsa --port $PORT --user $USER -e none \ |
20 | --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \ | 20 | --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \ |
21 | 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} | 21 | 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} |
22 | if [ $? -ne 0 ]; then | 22 | if [ $? -ne 0 ]; then |