From: dtucker <dtucker@openbsd.org>
Date: Fri, 23 Jul 2021 05:07:16 +0000 (+0000)
Subject: Test conversion of ed25519 and ecdsa keys too.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9004099247b0a477b498d8b222b600a0d985990f;p=openbsd

Test conversion of ed25519 and ecdsa keys too.
---

diff --git a/regress/usr.bin/ssh/keygen-convert.sh b/regress/usr.bin/ssh/keygen-convert.sh
index 7764955800c..fb11078a59f 100644
--- a/regress/usr.bin/ssh/keygen-convert.sh
+++ b/regress/usr.bin/ssh/keygen-convert.sh
@@ -1,15 +1,21 @@
-#	$OpenBSD: keygen-convert.sh,v 1.3 2021/07/23 04:56:21 dtucker Exp $
+#	$OpenBSD: keygen-convert.sh,v 1.4 2021/07/23 05:07:16 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="convert keys"
 
+ecdsa=0
 types=""
 for i in ${SSH_KEYTYPES}; do
 	case "$i" in
 		ssh-dss)	types="$types dsa" ;;
 		ssh-rsa)	types="$types rsa" ;;
+		ssh-ed25519)	types="$types ed25519" ;;
+		ecdsa-sha2-*)	ecdsa=1 ;;
 	esac
 done
+if [ "x$ecdsa" = "x1" ]; then
+	types="$types ecdsa"
+fi
 
 cat > $OBJ/askpass <<EOD
 #!/bin/sh