upstream: The script that cooks up PuTTY format host keys does not

understand the new key format so convert back to old format to create the
PuTTY key and remove it once done.

OpenBSD-Regress-ID: 2a449a18846c3a144bc645135b551ba6177e38d3

1 files changed, 6 insertions, 3 deletions

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index f0e3dabfe..699595301 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.63 2018/05/22 00:22:49 djm Exp $
+#       $OpenBSD: test-exec.sh,v 1.64 2018/08/10 01:35:49 dtucker Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -531,10 +531,13 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
             >> $OBJ/authorized_keys_$USER
 
         # Convert rsa2 host key to PuTTY format
-        ${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/rsa > \
+        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 > \
             ${OBJ}/.putty/sshhostkeys
-        ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/rsa >> \
+        ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/rsa_oldfmt >> \
             ${OBJ}/.putty/sshhostkeys
+        rm -f $OBJ/rsa_oldfmt
 
         # Setup proxied session
         mkdir -p ${OBJ}/.putty/sessions