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

diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
index 199d863a0dcde19ae7c98e060688473d83e7c42c..6678813a2bdb9745d9ce4f6294a7d57bbf05731a 100644 (file)
--- 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

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index b8e2009de8f9e4cba16fb2c96348e58709f567e3..b2c7913b81cfc587c960f2e58fcafa6f203f0b79 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.65 2019/01/27 06:30:53 dtucker Exp $
+#      $OpenBSD: test-exec.sh,v 1.66 2019/07/05 04:12:46 dtucker Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -527,13 +527,13 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
            >> $OBJ/authorized_keys_$USER
 
        # Convert rsa2 host key to PuTTY format
-       cp $OBJ/rsa $OBJ/rsa_oldfmt
-       ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/rsa_oldfmt >/dev/null
-       ${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/rsa_oldfmt > \
+       cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt
+       ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null
+       ${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/ssh-rsa_oldfmt > \
            ${OBJ}/.putty/sshhostkeys
-       ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/rsa_oldfmt >> \
+       ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/ssh-rsa_oldfmt >> \
            ${OBJ}/.putty/sshhostkeys
-       rm -f $OBJ/rsa_oldfmt
+       rm -f $OBJ/ssh-rsa_oldfmt
 
        # Setup proxied session
        mkdir -p ${OBJ}/.putty/sessions