summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-01-13 22:05:14 +1100
committerDamien Miller <djm@mindrot.org>2011-01-13 22:05:14 +1100
commit5278806e39bb1794959c71bba61610efb6ec0d58 (patch)
tree74853d0584145588efb576bc52d43bc5405c448d
parent9b16086e74c5df0b213bd871be6bee3c04c98f87 (diff)
- (djm) [regress/kextype.sh] Testing diffie-hellman-group-exchange-sha256
should not depend on ECC support
-rw-r--r--ChangeLog2
-rw-r--r--regress/kextype.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 354127ebe..a064d5690 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
10 - (djm) [myproposal.h] Fix reversed OPENSSL_VERSION_NUMBER test and bad 10 - (djm) [myproposal.h] Fix reversed OPENSSL_VERSION_NUMBER test and bad
11 #define that was causing diffie-hellman-group-exchange-sha256 to be 11 #define that was causing diffie-hellman-group-exchange-sha256 to be
12 incorrectly disabled 12 incorrectly disabled
13 - (djm) [regress/kextype.sh] Testing diffie-hellman-group-exchange-sha256
14 should not depend on ECC support
13 15
1420110212 1620110212
15 - OpenBSD CVS Sync 17 - OpenBSD CVS Sync
diff --git a/regress/kextype.sh b/regress/kextype.sh
index 71e2ee060..9f8b7bcd0 100644
--- a/regress/kextype.sh
+++ b/regress/kextype.sh
@@ -9,8 +9,8 @@ cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
9 9
10if test "$TEST_SSH_ECC" = "yes"; then 10if 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"
13fi 12fi
13kextypes="$kextypes diffie-hellman-group-exchange-sha256"
14kextypes="$kextypes diffie-hellman-group-exchange-sha1" 14kextypes="$kextypes diffie-hellman-group-exchange-sha1"
15kextypes="$kextypes diffie-hellman-group14-sha1" 15kextypes="$kextypes diffie-hellman-group14-sha1"
16kextypes="$kextypes diffie-hellman-group1-sha1" 16kextypes="$kextypes diffie-hellman-group1-sha1"