X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=test%2Ftrsa.com;h=54180843ee06a8e4e6ab0eb12994a0789022883b;hb=385b3486661628f3f806205752bf968b8114b347;hp=7862e902db3975a6e612922b8d57a1761ae05d2c;hpb=bc23b70e47531cabe5b3c329ba0b5d58777fbb7b;p=openssl.git

diff --git a/test/trsa.com b/test/trsa.com
index 7862e902db..54180843ee 100644
--- a/test/trsa.com
+++ b/test/trsa.com
@@ -1,35 +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]"
 $
-$	found_it := NO
-$	define/user sys$output trsa-standard-commands.
-$	mcr 'exe_dir'openssl list-standard-commands
-$	open/read f trsa-standard-commands.
-$ loop_standard_commands:
-$	read/end=loop_standard_commands_end f i
-$	if f$edit(i,"lowercase") .eqs. "rsa"
+$	set noon
+$	define/user sys$output nla0:
+$	mcr 'exe_dir'openssl no-rsa
+$	save_severity=$SEVERITY
+$	set on
+$	if save_severity
 $	then
-$	    found_it := YES
-$	    goto loop_standard_commands_end
+$	    write sys$output "skipping RSA conversion test"
+$	    exit
 $	endif
-$	goto loop_standard_commands
-$ loop_standard_commands_end:
-$	close f
-$	delete trsa-standard-commands.;*
 $
-$	cmd := mcr 'exe_dir'openssl rsa
+$	cmd = "mcr ''exe_dir'openssl rsa"
 $
-$	t := testrsa.pem
+$	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