]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Use private key that is allowed by sshd defaults in conch
authoranton@openbsd.org <anton@openbsd.org>
Mon, 23 Oct 2023 11:30:49 +0000 (11:30 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Thu, 26 Oct 2023 12:34:29 +0000 (23:34 +1100)
interop tests.

ok dtucker@

OpenBSD-Regress-ID: 3b7f65c8f409c328bcd4b704f60cb3d31746f045

regress/conch-ciphers.sh

index 6678813a2bdb9745d9ce4f6294a7d57bbf05731a..37b363e81d9da73665daf07aac462aecc6240240 100644 (file)
@@ -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