From 74b541bfabdcb57c1683cd9b3f1d1f4d5e41563e Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Fri, 5 Jul 2019 04:12:46 +0000 Subject: upstream: Adapt the PuTTY/Conch tests to new key names. 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. Adapt the tests to the new file names. bz#3020, patch from cjwatson at debian.org. OpenBSD-Regress-ID: fd342a37db4d55aa4ec85316f73082c8eb96e64e --- regress/conch-ciphers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'regress/conch-ciphers.sh') diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh index 199d863a0..6678813a2 100644 --- a/regress/conch-ciphers.sh +++ b/regress/conch-ciphers.sh @@ -1,4 +1,4 @@ -# $OpenBSD: conch-ciphers.sh,v 1.3 2013/05/17 04:29:14 dtucker Exp $ +# $OpenBSD: conch-ciphers.sh,v 1.4 2019/07/05 04:12:46 dtucker Exp $ # Placed in the Public Domain. tid="conch ciphers" @@ -16,7 +16,7 @@ for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \ rm -f ${COPY} # XXX the 2nd "cat" seems to be needed because of buggy FD handling # in conch - ${CONCH} --identity $OBJ/rsa --port $PORT --user $USER -e none \ + ${CONCH} --identity $OBJ/ssh-rsa --port $PORT --user $USER -e none \ --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \ 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} if [ $? -ne 0 ]; then -- cgit v1.2.3