summaryrefslogtreecommitdiff
path: root/regress/conch-ciphers.sh
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2018-08-30 00:58:56 +0100
committerColin Watson <cjwatson@debian.org>2019-06-21 16:14:04 +0100
commita20835ce2f9899305421bc478ba29d6524e89433 (patch)
tree487dd092ddd127620acf17a68fa2ce3a2edfb39c /regress/conch-ciphers.sh
parent42519a0f32765726ccd18a14aa6e877413a69662 (diff)
Work around conch interoperability failure
Twisted Conch fails to read private keys in the new format (https://twistedmatrix.com/trac/ticket/9515). Work around this until it can be fixed in Twisted. Forwarded: not-needed Last-Update: 2019-06-14 Patch-Name: conch-old-privkey-format.patch
Diffstat (limited to 'regress/conch-ciphers.sh')
-rw-r--r--regress/conch-ciphers.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
index 51e3b705f..fa24552b0 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/ssh-rsa --port $PORT --user $USER -e none \ 19 ${CONCH} --identity $OBJ/ssh-rsa_oldfmt --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