2 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e22ac3cd4..3fd51a6bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20131110
+ - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by
+   querying the ones that are compiled in.
+
 20131109
  - (dtucker) OpenBSD CVS Sync
    - dtucker@cvs.openbsd.org 2013/11/09 05:41:34
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