generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skip DH-specific tests when no-dh has been configured.

Browse Source 
PR: 353
This commit is contained in:
Richard Levitte 2002-12-12 18:43:10 +00:00
parent 14676ffcd6
commit 0d3f2ccb62
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/testssl
View File

@ -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 if ../apps/openssl no-dh; then
$ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1 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 if ../apps/openssl no-rsa; then
echo skipping RSA tests echo skipping RSA tests
@ -130,8 +134,12 @@ else
echo test tls1 with 1024bit RSA, no DHE, multiple handshakes 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 ./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 if ../apps/openssl no-dh; then
./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1 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 fi
exit 0 exit 0

32
test/testssl.com
View File

@ -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 $ set noon
$ define/user sys$output nla0: $ define/user sys$output nla0:
$ mcr 'exe_dir'openssl no-rsa $ 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 $ 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 $ then
$ write sys$output "skipping RSA tests" $ write sys$output "skipping RSA tests"
$ else $ 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 $ 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 $ if $severity .ne. 1 then goto exit3
$ $
$ write sys$output "test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes" $ if no_dh
$ mcr 'texe_dir'ssltest -v -bio_pair -tls1 -cert [-.apps]server2.pem -dhe1024dsa -num 10 -f -time $ then
$ if $severity .ne. 1 then goto exit3 $ 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 $ endif
$ $
$ RET = 1 $ RET = 1