add commented out option to allow use of older PKITS data

[openssl.git] / test / tpkcs7d.com

diff --git a/test/tpkcs7d.com b/test/tpkcs7d.com
index 1f76adcb418591d26ee399c83c27454ce532dbe2..eea8c888ee65df550da2163de564bc761be7ed20 100644 (file)
--- a/test/tpkcs7d.com
+++ b/test/tpkcs7d.com
@@ -1,16 +1,26 @@
 $! TPKCS7.COM  --  Tests pkcs7 keys
 $
-$      __arch := VAX
-$      if f$getsyi("cpu") .ge. 128 then __arch := AXP
-$      exe_dir := sys$disk:[-.'__arch'.exe.apps]
-$
-$      cmd := mcr 'exe_dir'openssl pkcs7
-$
-$      t := pkcs7-1.pem
+$      __arch = "VAX"
+$      if f$getsyi("cpu") .ge. 128 then -
+          __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+$      if __arch .eqs. "" then __arch = "UNK"
+$!
+$      if (p2 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$      exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
+$
+$      cmd = "mcr ''exe_dir'openssl pkcs7"
+$
+$      t = "pkcs7-1.pem"
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing PKCS7 conversions (2)"
-$      copy 't' fff.p
+$      if f$search("fff.*") .nes "" then delete fff.*;*
+$      if f$search("ff.*") .nes "" then delete ff.*;*
+$      if f$search("f.*") .nes "" then delete f.*;*
+$      convert/fdl=sys$input: 't' fff.p
+RECORD
+       FORMAT STREAM_LF
 $
 $      write sys$output "p -> d"
 $      'cmd' -in fff.p -inform p -outform d -out f.d