diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 18:23:38 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 18:23:38 +1100 |
commit | eab5f0df90cad495ee65abdb557538dbfb625d15 (patch) | |
tree | d93cf676ec18859bee5e6fe5a75b15da761d89a3 /regress/kextype.sh | |
parent | b69e033e6704000be33ed6dc47eb9ac28f10b14b (diff) |
- (dtucker) [Makefile configure.ac regress/Makefile regress/keytype.sh]
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.
Diffstat (limited to 'regress/kextype.sh')
-rw-r--r-- | regress/kextype.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/regress/kextype.sh b/regress/kextype.sh index ba6fd9509..22ceb40c9 100644 --- a/regress/kextype.sh +++ b/regress/kextype.sh | |||
@@ -7,7 +7,9 @@ TIME=/usr/bin/time | |||
7 | cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak | 7 | cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak |
8 | cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak | 8 | cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak |
9 | 9 | ||
10 | kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521" | 10 | if "$TEST_SSH_ECC" = "yes"; then |
11 | kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521" | ||
12 | fi | ||
11 | kextypes="$kextypes diffie-hellman-group-exchange-sha256" | 13 | kextypes="$kextypes diffie-hellman-group-exchange-sha256" |
12 | kextypes="$kextypes diffie-hellman-group-exchange-sha1" | 14 | kextypes="$kextypes diffie-hellman-group-exchange-sha1" |
13 | kextypes="$kextypes diffie-hellman-group14-sha1" | 15 | kextypes="$kextypes diffie-hellman-group14-sha1" |