Update from 0.9.8-stable.

[openssl.git] / test / testssl.com

diff --git a/test/testssl.com b/test/testssl.com
index ca087773be70b7b8862984689524972d1b8a6493..b79d470a1476afbe8bc43b3acbfbf0f6fefb1dfe 100644 (file)
--- a/test/testssl.com
+++ b/test/testssl.com
@@ -1,7 +1,9 @@
 $! TESTSSL.COM
 $
 $      __arch := VAX
-$      if f$getsyi("cpu") .ge. 128 then __arch := AXP
+$      if f$getsyi("cpu") .ge. 128 then -
+          __arch := f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+$      if __arch .eqs. "" then __arch := UNK
 $      texe_dir := sys$disk:[-.'__arch'.exe.test]
 $      exe_dir := sys$disk:[-.'__arch'.exe.apps]
 $
@@ -19,12 +21,12 @@ $       cert=p2
 $      endif
 $      ssltest := mcr 'texe_dir'ssltest -key 'key' -cert 'cert' -c_key 'key' -c_cert 'cert'
 $
-$      define/user sys$output test-ssltest-output.
+$      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-ssltest-output. "DSA Public Key"/exact
+$      search/output=nla0: testssl-x509-output. "DSA Public Key"/exact
 $      if $severity .eq. 1
 $      then
 $          dsa_cert := YES
@@ -32,7 +34,7 @@ $     else
 $          dsa_cert := NO
 $      endif
 $      set on
-$      delete testssl-ssltest-output.;*
+$      delete testssl-x509-output.;*
 $
 $      if p3 .eqs. ""
 $      then
@@ -159,16 +161,25 @@ $ if $severity .ne. 1 then goto exit3
 $
 $!###########################################################################
 $
-$      write sys$output "test tls1 with 1024bti anonymous SH, 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 +187,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
@@ -186,5 +202,5 @@ $   goto exit
 $ exit3:
 $      RET = 3
 $ exit:
-$      delete certs.tmp;*
+$      if p3 .eqs. "" then delete certs.tmp;*
 $      exit 'RET'