diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 18:41:50 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 18:41:50 +1100 |
commit | f619d1cad948193e53910ff48bc0b36547fa6d8f (patch) | |
tree | d3e35115fad4848cd1f4db289e01e3074efeb6a1 | |
parent | 345178d95103a976044ed44de0ad19cf1075706b (diff) |
- (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.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | regress/kextype.sh | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -47,6 +47,9 @@ | |||
47 | Import recent changes to regress/Makefile, pass a flag to enable ECC tests | 47 | Import recent changes to regress/Makefile, pass a flag to enable ECC tests |
48 | from configure through to regress/Makefile and use it in the tests. | 48 | from configure through to regress/Makefile and use it in the tests. |
49 | - (dtucker) [regress/kextype.sh] Add missing "test". | 49 | - (dtucker) [regress/kextype.sh] Add missing "test". |
50 | - (dtucker) [regress/kextype.sh] Make sha256 test depend on ECC. This is not | ||
51 | strictly correct since while ECC requires sha256 the reverse is not true | ||
52 | however it does prevent spurious test failures. | ||
50 | 53 | ||
51 | 20101025 | 54 | 20101025 |
52 | - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with | 55 | - (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 | |||
9 | 9 | ||
10 | if test "$TEST_SSH_ECC" = "yes"; then | 10 | if test "$TEST_SSH_ECC" = "yes"; then |
11 | kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521" | 11 | kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521" |
12 | kextypes="$kextypes diffie-hellman-group-exchange-sha256" | ||
12 | fi | 13 | fi |
13 | kextypes="$kextypes diffie-hellman-group-exchange-sha256" | ||
14 | kextypes="$kextypes diffie-hellman-group-exchange-sha1" | 14 | kextypes="$kextypes diffie-hellman-group-exchange-sha1" |
15 | kextypes="$kextypes diffie-hellman-group14-sha1" | 15 | kextypes="$kextypes diffie-hellman-group14-sha1" |
16 | kextypes="$kextypes diffie-hellman-group1-sha1" | 16 | kextypes="$kextypes diffie-hellman-group1-sha1" |