X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Ftrsa.com;h=54180843ee06a8e4e6ab0eb12994a0789022883b;hp=9c9083d02b8e24cf9089a01b19ce59a96704f5f4;hb=7d453a3b49e911e85883fe367a7cb18ef03382ad;hpb=7d7d2cbcb02206f3393681f2bce198e11e2e185b

diff --git a/test/trsa.com b/test/trsa.com
index 9c9083d02b..54180843ee 100644
--- a/test/trsa.com
+++ b/test/trsa.com
@@ -1,16 +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"
-$	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
@@ -52,27 +73,27 @@ $	write sys$output "p -> p"
 $	'cmd' -in f.p -inform p -outform p -out ff.p3
 $	if $severity .ne. 1 then exit 3
 $
-$	difference/output=nl: fff.p f.p
+$	backup/compare fff.p f.p
 $	if $severity .ne. 1 then exit 3
-$	difference/output=nl: fff.p ff.p1
+$	backup/compare fff.p ff.p1
 $	if $severity .ne. 1 then exit 3
-$!	difference/output=nl: fff.p ff.p2
+$!	backup/compare fff.p ff.p2
 $!	if $severity .ne. 1 then exit 3
-$	difference/output=nl: fff.p ff.p3
+$	backup/compare fff.p ff.p3
 $	if $severity .ne. 1 then exit 3
 $
-$!	difference/output=nl: f.t ff.t1
+$!	backup/compare f.t ff.t1
 $!	if $severity .ne. 1 then exit 3
-$!	difference/output=nl: f.t ff.t2
+$!	backup/compare f.t ff.t2
 $!	if $severity .ne. 1 then exit 3
-$!	difference/output=nl: f.t ff.t3
+$!	backup/compare f.t ff.t3
 $!	if $severity .ne. 1 then exit 3
 $
-$	difference/output=nl: f.p ff.p1
+$	backup/compare f.p ff.p1
 $	if $severity .ne. 1 then exit 3
-$!	difference/output=nl: f.p ff.p2
+$!	backup/compare f.p ff.p2
 $!	if $severity .ne. 1 then exit 3
-$	difference/output=nl: f.p ff.p3
+$	backup/compare f.p ff.p3
 $	if $severity .ne. 1 then exit 3
 $
 $	delete f.*;*,ff.*;*,fff.*;*