commit 2f4766ceefe6657c5ad5fe92d13c411872acae0e
author dtucker@openbsd.org <dtucker@openbsd.org> Fri Aug 10 01:35:49 2018 +0000
committer Damien Miller <djm@mindrot.org> Fri Aug 10 11:40:21 2018 +1000
tree 91b9a58cae42536b0bccd5afea3d40d86e099416
parent e1b26ce504662a5d5b991091228984ccfd25f280

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

regress/test-exec.sh

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index f0e3dab..6995953 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 @@
 	    >> $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