From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Fri, 23 Jul 2021 05:07:16 +0000 (+0000)
Subject: upstream: Test conversion of ed25519 and ecdsa keys too.
X-Git-Tag: V_8_7_P1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1653ece6832b2b304d46866b262d5f69880a9ec7;p=thirdparty%2Fopenssh-portable.git

upstream: Test conversion of ed25519 and ecdsa keys too.

OpenBSD-Regress-ID: 3676d2d00e58e0d6d37f2878f108cc2b83bbe4bb
---

diff --git a/regress/keygen-convert.sh b/regress/keygen-convert.sh
index 776495580..fb11078a5 100644
--- a/regress/keygen-convert.sh
+++ b/regress/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