- (dtucker) [regress/kextype.sh] Make sha256 test depend on ECC. This is not

   strictly correct since while ECC requires sha256 the reverse is not true
   however it does prevent spurious test failures.

diff --git a/ChangeLog b/ChangeLog
index e540a4d183deafe17dbda4fb82adf668b8e44e79..b4211302a5cb50e69279c8ebc810f91a2d818bec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,9 @@
    Import recent changes to regress/Makefile, pass a flag to enable ECC tests
    from configure through to regress/Makefile and use it in the tests.
  - (dtucker) [regress/kextype.sh] Add missing "test".
+ - (dtucker) [regress/kextype.sh] Make sha256 test depend on ECC.  This is not
+   strictly correct since while ECC requires sha256 the reverse is not true
+   however it does prevent spurious test failures.
 
 20101025
  - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with

diff --git a/regress/kextype.sh b/regress/kextype.sh
index 9f8b7bcd0bdd0fc5770459a9bf7daf69e8390c92..71e2ee060cc665cadd0caf1d7b329fe984a54de0 100644 (file)
--- a/regress/kextype.sh
+++ b/regress/kextype.sh
@@ -9,8 +9,8 @@ cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
 
 if test "$TEST_SSH_ECC" = "yes"; then
        kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521"
+       kextypes="$kextypes diffie-hellman-group-exchange-sha256"
 fi
-kextypes="$kextypes diffie-hellman-group-exchange-sha256"
 kextypes="$kextypes diffie-hellman-group-exchange-sha1"
 kextypes="$kextypes diffie-hellman-group14-sha1"
 kextypes="$kextypes diffie-hellman-group1-sha1"