Fixed valgrind complaint due to BN_consttime_swap reading uninitialised data.

[openssl.git] / test / tpkcs7.com

diff --git a/test/tpkcs7.com b/test/tpkcs7.com
index 5ed920ac34581075c95dff54006367dc60ca0ad2..3fc4982bb009563e8bca2cc65491cdb4bb98b671 100644 (file)
--- a/test/tpkcs7.com
+++ b/test/tpkcs7.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 := testp7.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 = "testp7.pem"
 $      if p1 .nes. "" then t = p1
 $
 $      write sys$output "testing PKCS7 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
@@ -34,16 +44,16 @@ $   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.p3
+$      backup/compare fff.p ff.p3
 $      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.p3
+$      backup/compare f.p ff.p3
 $      if $severity .ne. 1 then exit 3
 $
 $      delete f.*;*,ff.*;*,fff.*;*