From da951b5e08c167acb5d6e2eec6f146502f5d6ed8 Mon Sep 17 00:00:00 2001 From: "anton@openbsd.org" Date: Mon, 23 Oct 2023 11:30:49 +0000 Subject: [PATCH] upstream: Use private key that is allowed by sshd defaults in conch interop tests. ok dtucker@ OpenBSD-Regress-ID: 3b7f65c8f409c328bcd4b704f60cb3d31746f045 --- regress/conch-ciphers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh index 6678813a2..37b363e81 100644 --- a/regress/conch-ciphers.sh +++ b/regress/conch-ciphers.sh @@ -1,4 +1,4 @@ -# $OpenBSD: conch-ciphers.sh,v 1.4 2019/07/05 04:12:46 dtucker Exp $ +# $OpenBSD: conch-ciphers.sh,v 1.5 2023/10/23 11:30:49 anton 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/ssh-rsa --port $PORT --user $USER -e none \ + ${CONCH} --identity $OBJ/ssh-ed25519 --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