summaryrefslogtreecommitdiff
path: root/regress/keytype.sh
diff options
context:
space:
mode:
authordtucker <dtucker>2010-11-05 07:23:38 +0000
committerdtucker <dtucker>2010-11-05 07:23:38 +0000
commit1948da62dbbd87a22330f89e75436240dfb6de12 (patch)
tree27831c51b7f8295e9a0c6b4e680914a0efa79ba4 /regress/keytype.sh
parent8ec76ed9e744f92fbad5726056869316f2ea37fb (diff)
downloadopenssh-1948da62dbbd87a22330f89e75436240dfb6de12.tar.gz
- (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/keytype.sh')
-rw-r--r--regress/keytype.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/regress/keytype.sh b/regress/keytype.sh
index 7be3cc0c..cd902458 100644
--- a/regress/keytype.sh
+++ b/regress/keytype.sh
@@ -7,7 +7,10 @@ TIME=/usr/bin/time
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
-ktypes="dsa-1024 rsa-2048 ecdsa-256 rsa-3072 ecdsa-384 ecdsa-521"
+ktypes="dsa-1024 rsa-2048 rsa-3072"
+if test "$TEST_SSH_ECC" = "yes"; then
+ ktypes="$ktypes ecdsa-256 ecdsa-384 ecdsa-521"
+fi
for kt in $ktypes; do
rm -f $OBJ/key.$kt