X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Ftestenc.com;h=75acd6f07fa0bd44aa7ff7052633b6ab4135f0ab;hb=cd22dfbf0109ae42f650c0d0b1d0e956fe9a1574;hp=0756e8badaaff49d6cdf554c5bee2db64e680aa8;hpb=7d7d2cbcb02206f3393681f2bce198e11e2e185b;p=oweals%2Fopenssl.git

diff --git a/test/testenc.com b/test/testenc.com
index 0756e8bada..75acd6f07f 100644
--- a/test/testenc.com
+++ b/test/testenc.com
@@ -1,26 +1,36 @@
 $! TESTENC.COM  --  Test encoding and decoding
 $
-$	__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"
 $
-$	testsrc := makefile.ssl
-$	test := p.txt
-$	cmd := mcr 'exe_dir'openssl
+$	exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
+$	testsrc = "makefile."
+$	test = "p.txt"
+$	cmd = "mcr ''exe_dir'openssl"
 $
-$	copy 'testsrc' 'test'
+$	if f$search(test) .nes. "" then delete 'test';*
+$	convert/fdl=sys$input: 'testsrc' 'test'
+RECORD
+	FORMAT STREAM_LF
+$
+$	if f$search(test+"-cipher") .nes. "" then delete 'test'-cipher;*
+$	if f$search(test+"-clear") .nes. "" then delete 'test'-clear;*
 $
 $	write sys$output "cat"
 $	'cmd' enc -in 'test' -out 'test'-cipher
 $	'cmd' enc -in 'test'-cipher -out 'test'-clear
-$	difference/output=nl: 'test' 'test'-clear
+$	backup/compare 'test' 'test'-clear
 $	if $severity .ne. 1 then exit 3
 $	delete 'test'-cipher;*,'test'-clear;*
 $
 $	write sys$output "base64"
 $	'cmd' enc -a -e -in 'test' -out 'test'-cipher
 $	'cmd' enc -a -d -in 'test'-cipher -out 'test'-clear
-$	difference/output=nl: 'test' 'test'-clear
+$	backup/compare 'test' 'test'-clear
 $	if $severity .ne. 1 then exit 3
 $	delete 'test'-cipher;*,'test'-clear;*
 $
@@ -30,16 +40,22 @@ $	open/read f 'test'-cipher-commands
 $ loop_cipher_commands:
 $	read/end=loop_cipher_commands_end f i
 $	write sys$output i
+$
+$	if f$search(test+"-"+i+"-cipher") .nes. "" then -
+		delete 'test'-'i'-cipher;*
+$	if f$search(test+"-"+i+"-clear") .nes. "" then -
+		delete 'test'-'i'-clear;*
+$
 $	'cmd' 'i' -bufsize 113 -e -k test -in 'test' -out 'test'-'i'-cipher
 $	'cmd' 'i' -bufsize 157 -d -k test -in 'test'-'i'-cipher -out 'test'-'i'-clear
-$	difference/output=nl: 'test' 'test'-'i'-clear
+$	backup/compare 'test' 'test'-'i'-clear
 $	if $severity .ne. 1 then exit 3
 $	delete 'test'-'i'-cipher;*,'test'-'i'-clear;*
 $
 $	write sys$output i," base64"
 $	'cmd' 'i' -bufsize 113 -a -e -k test -in 'test' -out 'test'-'i'-cipher
 $	'cmd' 'i' -bufsize 157 -a -d -k test -in 'test'-'i'-cipher -out 'test'-'i'-clear
-$	difference/output=nl: 'test' 'test'-'i'-clear
+$	backup/compare 'test' 'test'-'i'-clear
 $	if $severity .ne. 1 then exit 3
 $	delete 'test'-'i'-cipher;*,'test'-'i'-clear;*
 $