openssl-1.0.0e: resolve conflicts

1 files changed, 14 insertions, 12 deletions

diff --git a/src/lib/libssl/test/testssl.com b/src/lib/libssl/test/testssl.com
index 9c83afba04..f19edc4719 100644
--- a/src/lib/libssl/test/testssl.com
+++ b/src/lib/libssl/test/testssl.com
@@ -1,11 +1,14 @@
 $! TESTSSL.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
-$       texe_dir := sys$disk:[-.'__arch'.exe.test]
-$       exe_dir := sys$disk:[-.'__arch'.exe.apps]
+$       if __arch .eqs. "" then __arch = "UNK"
+$!
+$       if (p4 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$       texe_dir = "sys$disk:[-.''__arch'.exe.test]"
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
 $       if p1 .eqs. ""
 $       then
@@ -19,21 +22,21 @@ $	    cert="[-.apps]server.pem"
 $       else
 $           cert=p2
 $       endif
-$       ssltest := mcr 'texe_dir'ssltest -key 'key' -cert 'cert' -c_key 'key' -c_cert 'cert'
-$
+$       ssltest = "mcr ''texe_dir'ssltest -key ''key'"+ -
+         " -cert ''cert' -c_key ''key' -c_cert ''cert'"
+$!
+$       set noon
 $       define/user sys$output testssl-x509-output.
 $       define/user sys$error nla0:
 $       mcr 'exe_dir'openssl x509 -in 'cert' -text -noout
-$       set noon
 $       define/user sys$error nla0:
 $       search/output=nla0: testssl-x509-output. "DSA Public Key"/exact
 $       if $severity .eq. 1
 $       then
-$           dsa_cert := YES
+$           dsa_cert = "YES"
 $       else
-$           dsa_cert := NO
+$           dsa_cert = "NO"
 $       endif
-$       set on
 $       delete testssl-x509-output.;*
 $
 $       if p3 .eqs. ""
@@ -161,14 +164,12 @@ $	if $severity .ne. 1 then goto exit3
 $
 $!###########################################################################
 $
-$       set noon
 $       define/user sys$output nla0:
 $       mcr 'exe_dir'openssl no-rsa
 $       no_rsa=$SEVERITY
 $       define/user sys$output nla0:
 $       mcr 'exe_dir'openssl no-dh
 $       no_dh=$SEVERITY
-$       set on
 $
 $       if no_dh
 $       then
@@ -203,4 +204,5 @@ $ exit3:
 $       RET = 3
 $ exit:
 $       if p3 .eqs. "" then delete certs.tmp;*
+$       set on
 $       exit 'RET'