openssl-1.0.0e: resolve conflicts

1 files changed, 10 insertions, 7 deletions

diff --git a/src/lib/libssl/test/testss.com b/src/lib/libssl/test/testss.com
index 6598106b09..32a74d0fc2 100644
--- a/src/lib/libssl/test/testss.com
+++ b/src/lib/libssl/test/testss.com
@@ -1,16 +1,19 @@
 $! TESTSS.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
-$       exe_dir := sys$disk:[-.'__arch'.exe.apps]
+$       if __arch .eqs. "" then __arch = "UNK"
+$!
+$       if (p1 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
 $       digest="-md5"
-$       reqcmd := mcr 'exe_dir'openssl req
-$       x509cmd := mcr 'exe_dir'openssl x509 'digest'
-$       verifycmd := mcr 'exe_dir'openssl verify
-$       dummycnf := sys$disk:[-.apps]openssl-vms.cnf
+$       reqcmd = "mcr ''exe_dir'openssl req"
+$       x509cmd = "mcr ''exe_dir'openssl x509 ''digest'"
+$       verifycmd = "mcr ''exe_dir'openssl verify"
+$       dummycnf = "sys$disk:[-.apps]openssl-vms.cnf"
 $
 $       CAkey="""keyCA.ss"""
 $       CAcert="""certCA.ss"""