Make S/MIME test work.

[openssl.git] / test / testss.com

diff --git a/test/testss.com b/test/testss.com
index ce2c4b43f66d786c8fbd54aa2307f499c63df485..32a74d0fc2102e462997ca900c79f8e270364e88 100644 (file)
--- a/test/testss.com
+++ b/test/testss.com
@@ -1,14 +1,19 @@
 $! TESTSS.COM
 $
-$      __arch := VAX
-$      if f$getsyi("cpu") .ge. 128 then __arch := AXP
-$      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 (p1 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$      exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
-$      digest="-mdc2"
-$      reqcmd := mcr 'exe_dir'openssl req
-$      x509cmd := mcr 'exe_dir'openssl x509 'digest'
-$      verifycmd := mcr 'exe_dir'openssl verify
-$      dummycnf := sys$disk:[-.apps]openssl-vms.cnf
+$      digest="-md5"
+$      reqcmd = "mcr ''exe_dir'openssl req"
+$      x509cmd = "mcr ''exe_dir'openssl x509 ''digest'"
+$      verifycmd = "mcr ''exe_dir'openssl verify"
+$      dummycnf = "sys$disk:[-.apps]openssl-vms.cnf"
 $
 $      CAkey="""keyCA.ss"""
 $      CAcert="""certCA.ss"""
@@ -23,7 +28,20 @@ $    Ucert="""certU.ss"""
 $
 $      write sys$output ""
 $      write sys$output "make a certificate request using 'req'"
-$      'reqcmd' -config 'CAconf' -out 'CAreq' -keyout 'CAkey' -new ! -out err.ss
+$
+$      set noon
+$      define/user sys$output nla0:
+$      mcr 'exe_dir'openssl no-rsa
+$      save_severity=$SEVERITY
+$      set on
+$      if save_severity
+$      then
+$          req_new="-newkey dsa:[-.apps]dsa512.pem"
+$      else
+$          req_new="-new"
+$      endif
+$
+$      'reqcmd' -config 'CAconf' -out 'CAreq' -keyout 'CAkey' 'req_new' ! -out err.ss
 $      if $severity .ne. 1
 $      then
 $              write sys$output "error using 'req' to generate a certificate request"
@@ -73,7 +91,7 @@ $
 $      write sys$output ""
 $      write sys$output "make another certificate request using 'req'"
 $      define /user sys$output err.ss
-$      'reqcmd' -config 'Uconf' -out 'Ureq' -keyout 'Ukey' -new
+$      'reqcmd' -config 'Uconf' -out 'Ureq' -keyout 'Ukey' 'req_new'
 $      if $severity .ne. 1
 $      then
 $              write sys$output "error using 'req' to generate a certificate request"