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

PR: 353

diff --git a/test/testssl b/test/testssl
index ba5e41c8613872e59ad529246585df2880cdab95..ca8e718022aa08b21b9e2558cca693d42680b11c 100644 (file)
--- 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

diff --git a/test/testssl.com b/test/testssl.com
index 785f262f5ad5c889dec02eead9346f9fef70e823..26308f7715cd8098014c113a3df8eb6fa215f3ab 100644 (file)
--- 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