openssl-1.0.0e: resolve conflicts

1 files changed, 6 insertions, 4 deletions

diff --git a/src/lib/libssl/test/tverify.com b/src/lib/libssl/test/tverify.com
index 01431f4aac..d888344637 100644
--- a/src/lib/libssl/test/tverify.com
+++ b/src/lib/libssl/test/tverify.com
@@ -1,13 +1,15 @@
 $! TVERIFY.COM
 $
-$       __arch := VAX
+$       __arch = "VAX"
 $       if f$getsyi("cpu") .ge. 128 then -
            __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
-$       if __arch .eqs. "" then __arch := UNK
+$       if __arch .eqs. "" then __arch = "UNK"
+$!
+$       if (p1 .eqs. "64") then __arch = __arch+ "_64"
 $!
 $       line_max = 255 ! Could be longer on modern non-VAX.
 $       temp_file_name = "certs_"+ f$getjpi( "", "PID")+ ".tmp"
-$       exe_dir := sys$disk:[-.'__arch'.exe.apps]
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $       cmd = "mcr ''exe_dir'openssl verify ""-CAfile"" ''temp_file_name'"
 $       cmd_len = f$length( cmd)
 $       pems = "[-.certs...]*.pem"
@@ -19,7 +21,7 @@ $!
 $!      Loop through all the certificate files.
 $!
 $       args = ""
-$       old_f :=
+$       old_f = ""
 $ loop_file: 
 $           f = f$search( pems)
 $           if ((f .nes. "") .and. (f .nes. old_f))