Set Enveloped data version to 2 if ktri version not zero.

[openssl.git] / test / trsa.com

diff --git a/test/trsa.com b/test/trsa.com
index 28add5eefd090c994b7b67e7a06f0d417078d47d..54180843ee06a8e4e6ab0eb12994a0789022883b 100644 (file)
--- a/test/trsa.com
+++ b/test/trsa.com
@@ -1,19 +1,37 @@
 $! TRSA.COM  --  Tests rsa keys
 $
-$      __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 (p2 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$      exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
-$      cmd := mcr 'exe_dir'openssl rsa
+$      set noon
+$      define/user sys$output nla0:
+$      mcr 'exe_dir'openssl no-rsa
+$      save_severity=$SEVERITY
+$      set on
+$      if save_severity
+$      then
+$          write sys$output "skipping RSA conversion test"
+$          exit
+$      endif
 $
-$      t := testrsa.pem
+$      cmd = "mcr ''exe_dir'openssl rsa"
+$
+$      t = "testrsa.pem"
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing RSA conversions"
 $      if f$search("fff.*") .nes "" then delete fff.*;*
 $      if f$search("ff.*") .nes "" then delete ff.*;*
 $      if f$search("f.*") .nes "" then delete f.*;*
-$      copy 't' fff.p
+$      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