From 73396e6192874e6ce739bea2d860cc106529adcb Mon Sep 17 00:00:00 2001
From: dtucker <dtucker@openbsd.org>
Date: Fri, 23 Jul 2021 05:53:02 +0000
Subject: [PATCH] Simplify keygen-convert by using $SSH_KEYTYPES directly.

---
 regress/usr.bin/ssh/keygen-convert.sh | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/regress/usr.bin/ssh/keygen-convert.sh b/regress/usr.bin/ssh/keygen-convert.sh
index fb11078a59f..e0cb4654d8e 100644
--- a/regress/usr.bin/ssh/keygen-convert.sh
+++ b/regress/usr.bin/ssh/keygen-convert.sh
@@ -1,29 +1,15 @@
-#	$OpenBSD: keygen-convert.sh,v 1.4 2021/07/23 05:07:16 dtucker Exp $
+#	$OpenBSD: keygen-convert.sh,v 1.5 2021/07/23 05:53:02 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
 echo hunter2
 EOD
 chmod u+x $OBJ/askpass
 
-for t in $types; do
+for t in ${SSH_KEYTYPES}; do
 	# generate user key for agent
 	trace "generating $t key"
 	rm -f $OBJ/$t-key
-- 
2.20.1