Commit 6d62e85d authored by Richard Levitte's avatar Richard Levitte
Browse files

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

PR: 353
parent a01461da

test/testssl

+12 −4
Original line number Diff line number Diff line
@@ -112,8 +112,12 @@ $ssltest -bio_pair -server_auth -client_auth $CA || 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



  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

test/testssl.com

+23 −9
Original line number Diff line number Diff line
@@ -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,10 +185,15 @@ $ 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

$

$	    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

$	goto exit