20131221

 - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.

diff --git a/ChangeLog b/ChangeLog
index 3b64040c08ef112275c4a965f62beaaf939e555e..017c05a73167a7b168b3cfd6b37c07ab876a3a79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20131221
+ - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.
+
 20131219
  - (dtucker) [configure.ac] bz#2178: Don't try to use BSM on Solaris versions
    greater than 11 either rather than just 11.  Patch from Tomas Kuthan.

diff --git a/regress/keytype.sh b/regress/keytype.sh
index 2c57ec6b15d2700f5e1bfc00a4e94a90254a0f1f..9752acb0a080b0a5d88581ccbcd553b3c8d850bb 100644 (file)
--- a/regress/keytype.sh
+++ b/regress/keytype.sh
@@ -11,12 +11,14 @@ fi
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
 cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
 
+# Traditional and builtin key types.
 ktypes="dsa-1024 rsa-2048 rsa-3072 ed25519-512"
+# Types not present in all OpenSSL versions.
 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" ;;
+               ecdsa-sha2-nistp256)    ktypes="$ktypes ecdsa-256" ;;
+               ecdsa-sha2-nistp384)    ktypes="$ktypes ecdsa-384" ;;
+               ecdsa-sha2-nistp521)    ktypes="$ktypes ecdsa-521" ;;
        esac
 done