[openssh-commits] [openssh] 03/04: upstream: Simplify keygen-convert by using $SSH_KEYTYPES directly.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 2b76f1dd19787e784711ea297ad8fc938b4484fd
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Fri Jul 23 05:53:02 2021 +0000

    upstream: Simplify keygen-convert by using $SSH_KEYTYPES directly.
    
    OpenBSD-Regress-ID: cdbe408ec3671ea9ee9b55651ee551370d2a4108
---
 regress/keygen-convert.sh | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.