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>2020-02-19 11:49:55 +0000
commit2e889a135439e6234502c813fa0ef2eb1fcd733c (patch)
tree50ec162b4c93037649a2cc18c9a43a2acabcaac0 /regress/conch-ciphers.sh
parent5c1ed7182e928fcf03d11c1bcc51c26c2c42629d (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-10-09 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 6678813a2..6ff5da20b 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