From f619d1cad948193e53910ff48bc0b36547fa6d8f Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 5 Nov 2010 18:41:50 +1100
Subject: [PATCH]  - (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.

---
 ChangeLog          | 3 +++
 regress/kextype.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e540a4d18..b4211302a 100644
--- 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 9f8b7bcd0..71e2ee060 100644
--- 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"