diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-07-05 04:12:46 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2019-07-05 15:07:55 +1000 |
commit | 74b541bfabdcb57c1683cd9b3f1d1f4d5e41563e (patch) | |
tree | 9740e6b78e45ccdf70622b5bc7e84fff7073c71e /regress/test-exec.sh | |
parent | de08335a4cfaa9b7081e94ea4a8b7153c230546d (diff) |
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 'regress/test-exec.sh')
-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 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.65 2019/01/27 06:30:53 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.66 2019/07/05 04:12:46 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -527,13 +527,13 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then | |||
527 | >> $OBJ/authorized_keys_$USER | 527 | >> $OBJ/authorized_keys_$USER |
528 | 528 | ||
529 | # Convert rsa2 host key to PuTTY format | 529 | # Convert rsa2 host key to PuTTY format |
530 | cp $OBJ/rsa $OBJ/rsa_oldfmt | 530 | cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt |
531 | ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/rsa_oldfmt >/dev/null | 531 | ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null |
532 | ${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/rsa_oldfmt > \ | 532 | ${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/ssh-rsa_oldfmt > \ |
533 | ${OBJ}/.putty/sshhostkeys | 533 | ${OBJ}/.putty/sshhostkeys |
534 | ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/rsa_oldfmt >> \ | 534 | ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/ssh-rsa_oldfmt >> \ |
535 | ${OBJ}/.putty/sshhostkeys | 535 | ${OBJ}/.putty/sshhostkeys |
536 | rm -f $OBJ/rsa_oldfmt | 536 | rm -f $OBJ/ssh-rsa_oldfmt |
537 | 537 | ||
538 | # Setup proxied session | 538 | # Setup proxied session |
539 | mkdir -p ${OBJ}/.putty/sessions | 539 | mkdir -p ${OBJ}/.putty/sessions |