diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-12-12 18:43:29 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-12-12 18:43:29 +0000 |
| commit | 6d62e85d841a28fb352b285684234d0e6b2cdc2c (patch) | |
| tree | 6c8d51191783031865bb8bc999b6f5854da7bb06 | |
| parent | a01461da99894034f579bea7f1983da75e53c3cb (diff) | |
| download | openssl-6d62e85d841a28fb352b285684234d0e6b2cdc2c.tar.gz | |
Skip DH-specific tests when no-dh has been configured.
PR: 353
| -rw-r--r-- | test/testssl | 16 | ||||
| -rw-r--r-- | test/testssl.com | 32 |
2 files changed, 35 insertions, 13 deletions
diff --git a/test/testssl b/test/testssl index 2151a6438c..ad4f45f1fa 100644 --- a/test/testssl +++ b/test/testssl @@ -112,8 +112,12 @@ $ssltest -bio_pair -server_auth -client_auth $CA || exit 1 ############################################################################# -echo test tls1 with 1024bit anonymous DH, multiple handshakes -$ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time || 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 || exit 1 +fi if ../apps/openssl no-rsa; then echo skipping RSA tests @@ -121,8 +125,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 || 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 || 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 || exit 1 + fi fi exit 0 diff --git a/test/testssl.com b/test/testssl.com index 785f262f5a..26308f7715 100644 --- a/test/testssl.com +++ b/test/testssl.com @@ -159,16 +159,25 @@ $ if $severity .ne. 1 then goto exit3 $ $!########################################################################### $ -$ write sys$output "test tls1 with 1024bit anonymous DH, multiple handshakes" -$ 'ssltest' -v -bio_pair -tls1 -cipher "ADH" -dhe1024dsa -num 10 -f -time -$ if $severity .ne. 1 then goto exit3 -$ $ set noon $ define/user sys$output nla0: $ mcr 'exe_dir'openssl no-rsa -$ save_severity=$SEVERITY +$ no_rsa=$SEVERITY +$ define/user sys$output nla0: +$ mcr 'exe_dir'openssl no-dh +$ no_dh=$SEVERITY $ set on -$ if save_severity +$ +$ if no_dh +$ then +$ write sys$output "skipping anonymous DH tests" +$ else +$ write sys$output "test tls1 with 1024bit anonymous DH, multiple handshakes" +$ 'ssltest' -v -bio_pair -tls1 -cipher "ADH" -dhe1024dsa -num 10 -f -time +$ if $severity .ne. 1 then goto exit3 +$ endif +$ +$ if no_rsa $ then $ write sys$output "skipping RSA tests" $ else @@ -176,9 +185,14 @@ $ write sys$output "test tls1 with 1024bit RSA, no DHE, multiple handshakes" $ mcr 'texe_dir'ssltest -v -bio_pair -tls1 -cert [-.apps]server2.pem -no_dhe -num 10 -f -time $ if $severity .ne. 1 then goto exit3 $ -$ write sys$output "test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes" -$ mcr 'texe_dir'ssltest -v -bio_pair -tls1 -cert [-.apps]server2.pem -dhe1024dsa -num 10 -f -time -$ if $severity .ne. 1 then goto exit3 +$ if no_dh +$ then +$ write sys$output "skipping RSA+DHE tests" +$ else +$ write sys$output "test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes" +$ mcr 'texe_dir'ssltest -v -bio_pair -tls1 -cert [-.apps]server2.pem -dhe1024dsa -num 10 -f -time +$ if $severity .ne. 1 then goto exit3 +$ endif $ endif $ $ RET = 1 |