From b6a75b0b93b8faa6f79c3a395ab6c71f3f880b80 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 10 Nov 2013 20:25:22 +1100
Subject:  - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be
 tested by    querying the ones that are compiled in.

---
 regress/keytype.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'regress/keytype.sh')

diff --git a/regress/keytype.sh b/regress/keytype.sh
index 59586bf0d..65436b2c0 100644
--- a/regress/keytype.sh
+++ b/regress/keytype.sh
@@ -12,9 +12,13 @@ cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
 cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
 
 ktypes="dsa-1024 rsa-2048 rsa-3072"
-if test "$TEST_SSH_ECC" = "yes"; then
-	ktypes="$ktypes ecdsa-256 ecdsa-384 ecdsa-521"
-fi
+for i in `$SSH -Q key`; do
+	case "$i" in
+		ecdsa-sha2-nistp256)	ktype="$ktype ecdsa-256" ;;
+		ecdsa-sha2-nistp384)	ktype="$ktype ecdsa-384" ;;
+		ecdsa-sha2-nistp521)	ktype="$ktype ecdsa-521" ;;
+	esac
+done
 
 for kt in $ktypes; do 
 	rm -f $OBJ/key.$kt
-- 
cgit v1.2.3