diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-07-05 06:12:46 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-07-05 07:07:55 +0200 |
| commit | 74b541bfabdcb57c1683cd9b3f1d1f4d5e41563e (patch) | |
| tree | 9740e6b78e45ccdf70622b5bc7e84fff7073c71e /regress/test-exec.sh | |
| parent | upstream: Add a sleep to allow forwards to come up. (diff) | |
| download | openssh-74b541bfabdcb57c1683cd9b3f1d1f4d5e41563e.tar.xz openssh-74b541bfabdcb57c1683cd9b3f1d1f4d5e41563e.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | regress/test-exec.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index b8e2009de..b2c7913b8 100644 --- 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 |