upstream: Simplify keygen-convert by using $SSH_KEYTYPES directly.

OpenBSD-Regress-ID: cdbe408ec3671ea9ee9b55651ee551370d2a4108

diff --git a/regress/keygen-convert.sh b/regress/keygen-convert.sh
index fb11078a59f7f3dbd12bf642408c825b72824334..e0cb4654d8ebb0eed1276b33b073b6cc8d69ece8 100644 (file)
--- a/regress/keygen-convert.sh
+++ b/regress/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