summaryrefslogtreecommitdiffstats
path: root/test/testssl
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2002-12-12 18:43:10 +0000
committerRichard Levitte <levitte@openssl.org>2002-12-12 18:43:10 +0000
commit0d3f2ccb626f3fe5997a36e9d10a8486c6350f12 (patch)
treeaf605050091706e60cfba3b5f4f9c2439f8c1e0f /test/testssl
parent14676ffcd6a27532075f915b7f0606a52c8feed9 (diff)
Skip DH-specific tests when no-dh has been configured.
PR: 353
Diffstat (limited to 'test/testssl')
-rw-r--r--test/testssl16
1 files changed, 12 insertions, 4 deletions
diff --git a/test/testssl b/test/testssl
index ba5e41c861..ca8e718022 100644
--- a/test/testssl
+++ b/test/testssl
@@ -121,8 +121,12 @@ $ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1
#############################################################################
-echo test tls1 with 1024bit anonymous DH, multiple handshakes
-$ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1
+if ../apps/openssl no-dh; then
+ echo skipping anonymous DH tests
+else
+ echo test tls1 with 1024bit anonymous DH, multiple handshakes
+ $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1
+fi
if ../apps/openssl no-rsa; then
echo skipping RSA tests
@@ -130,8 +134,12 @@ else
echo test tls1 with 1024bit RSA, no DHE, multiple handshakes
./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time $extra || exit 1
- echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
- ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
+ if ../apps/openssl no-dh; then
+ echo skipping RSA+DHE tests
+ else
+ echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
+ ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
+ fi
fi
exit 0