Fix TLSProxy end of test detection

[openssl.git] / test / testssl.com

diff --git a/test/testssl.com b/test/testssl.com
index 785f262f5ad5c889dec02eead9346f9fef70e823..6f9b233e45034f75c323281207f83d37c71effa2 100644 (file)
--- a/test/testssl.com
+++ b/test/testssl.com
@@ -1,9 +1,14 @@
 $! TESTSSL.COM
 $
-$      __arch := VAX
-$      if f$getsyi("cpu") .ge. 128 then __arch := AXP
-$      texe_dir := sys$disk:[-.'__arch'.exe.test]
-$      exe_dir := sys$disk:[-.'__arch'.exe.apps]
+$      __arch = "VAX"
+$      if f$getsyi("cpu") .ge. 128 then -
+          __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+$      if __arch .eqs. "" then __arch = "UNK"
+$!
+$      if (p4 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$      texe_dir = "sys$disk:[-.''__arch'.exe.test]"
+$      exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
 $      if p1 .eqs. ""
 $      then
@@ -17,21 +22,21 @@ $       cert="[-.apps]server.pem"
 $      else
 $          cert=p2
 $      endif
-$      ssltest := mcr 'texe_dir'ssltest -key 'key' -cert 'cert' -c_key 'key' -c_cert 'cert'
-$
+$      ssltest = "mcr ''texe_dir'ssltest -key ''key'"+ -
+        " -cert ''cert' -c_key ''key' -c_cert ''cert'"
+$!
+$      set noon
 $      define/user sys$output testssl-x509-output.
 $      define/user sys$error nla0:
 $      mcr 'exe_dir'openssl x509 -in 'cert' -text -noout
-$      set noon
 $      define/user sys$error nla0:
 $      search/output=nla0: testssl-x509-output. "DSA Public Key"/exact
 $      if $severity .eq. 1
 $      then
-$          dsa_cert := YES
+$          dsa_cert = "YES"
 $      else
-$          dsa_cert := NO
+$          dsa_cert = "NO"
 $      endif
-$      set on
 $      delete testssl-x509-output.;*
 $
 $      if p3 .eqs. ""
@@ -44,25 +49,6 @@ $    endif
 $
 $!###########################################################################
 $
-$      write sys$output "test sslv2"
-$      'ssltest' -ssl2
-$      if $severity .ne. 1 then goto exit3
-$
-$      write sys$output "test sslv2 with server authentication"
-$      'ssltest' -ssl2 -server_auth 'CA'
-$      if $severity .ne. 1 then goto exit3
-$
-$      if .not. dsa_cert
-$      then
-$          write sys$output "test sslv2 with client authentication"
-$          'ssltest' -ssl2 -client_auth 'CA'
-$          if $severity .ne. 1 then goto exit3
-$
-$          write sys$output "test sslv2 with both client and server authentication"
-$          'ssltest' -ssl2 -server_auth -client_auth 'CA'
-$          if $severity .ne. 1 then goto exit3
-$      endif
-$
 $      write sys$output "test sslv3"
 $      'ssltest' -ssl3
 $      if $severity .ne. 1 then goto exit3
@@ -95,25 +81,6 @@ $    write sys$output "test sslv2/sslv3 with both client and server authentication"
 $      'ssltest' -server_auth -client_auth 'CA'
 $      if $severity .ne. 1 then goto exit3
 $
-$      write sys$output "test sslv2 via BIO pair"
-$      'ssltest' -bio_pair -ssl2 
-$      if $severity .ne. 1 then goto exit3
-$
-$      write sys$output "test sslv2 with server authentication via BIO pair"
-$      'ssltest' -bio_pair -ssl2 -server_auth 'CA' 
-$      if $severity .ne. 1 then goto exit3
-$
-$      if .not. dsa_cert
-$      then
-$          write sys$output "test sslv2 with client authentication via BIO pair"
-$          'ssltest' -bio_pair -ssl2 -client_auth 'CA' 
-$          if $severity .ne. 1 then goto exit3
-$
-$          write sys$output "test sslv2 with both client and server authentication via BIO pair"
-$          'ssltest' -bio_pair -ssl2 -server_auth -client_auth 'CA' 
-$          if $severity .ne. 1 then goto exit3
-$      endif
-$
 $      write sys$output "test sslv3 via BIO pair"
 $      'ssltest' -bio_pair -ssl3 
 $      if $severity .ne. 1 then goto exit3
@@ -159,16 +126,23 @@ $ 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
-$      set on
-$      if save_severity
+$      no_rsa=$SEVERITY
+$      define/user sys$output nla0:
+$      mcr 'exe_dir'openssl no-dhparam
+$      no_dh=$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 +150,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
@@ -187,4 +166,5 @@ $ exit3:
 $      RET = 3
 $ exit:
 $      if p3 .eqs. "" then delete certs.tmp;*
+$      set on
 $      exit 'RET'