openssl-1.0.0e: resolve conflicts

15 files changed, 463 insertions, 200 deletions

diff --git a/src/lib/libssl/test/maketests.com b/src/lib/libssl/test/maketests.com
index ca072f1d11..386e5cf3c1 100644
--- a/src/lib/libssl/test/maketests.com
+++ b/src/lib/libssl/test/maketests.com
@@ -25,7 +25,7 @@ $!	   VAXC	 For VAX C.
 $!         DECC  For DEC C.
 $!         GNUC  For GNU C.
 $!
-$!  If you don't speficy a compiler, it will try to determine which
+$!  If you don't specify a compiler, it will try to determine which
 $!  "C" compiler to use.
 $!
 $!  P3, if defined, sets a TCP/IP library to use, through one of the following
@@ -37,46 +37,87 @@ $!
 $!  P4, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
 $!
 $!
+$!  P5, if defined, specifies the C pointer size.  Ignored on VAX.
+$!      ("64=ARGV" gives more efficient code with HP C V7.3 or newer.)
+$!      Supported values are:
+$!
+$!      ""       Compile with default (/NOPOINTER_SIZE)
+$!      32       Compile with /POINTER_SIZE=32 (SHORT)
+$!      64       Compile with /POINTER_SIZE=64[=ARGV] (LONG[=ARGV])
+$!               (Automatically select ARGV if compiler supports it.)
+$!      64=      Compile with /POINTER_SIZE=64 (LONG).
+$!      64=ARGV  Compile with /POINTER_SIZE=64=ARGV (LONG=ARGV).
+$!
+$!  P6, if defined, specifies a directory where ZLIB files (zlib.h,
+$!  libz.olb) may be found.  Optionally, a non-default object library
+$!  name may be included ("dev:[dir]libz_64.olb", for example).
+$!
+$!
+$! Announce/identify.
+$!
+$ proc = f$environment( "procedure")
+$ write sys$output "@@@ "+ -
+   f$parse( proc, , , "name")+ f$parse( proc, , , "type")
+$!
 $! Define A TCP/IP Library That We Will Need To Link To.
-$! (That is, If Wee Need To Link To One.)
+$! (That is, If We Need To Link To One.)
 $!
 $ TCPIP_LIB = ""
+$ ZLIB_LIB = ""
 $!
 $! Check Which Architecture We Are Using.
 $!
-$ if (f$getsyi( "HW_MODEL") .lt. 1024)
+$ if (f$getsyi( "cpu") .lt. 128)
 $ then
-$    arch = "VAX"
+$    ARCH = "VAX"
 $ else
-$    arch = ""
-$    arch = arch+ f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
-$    if (arch .eqs. "") then arch = "UNK"
+$    ARCH = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+$    if (ARCH .eqs. "") then ARCH = "UNK"
 $ endif
 $!
-$! Define The OBJ and EXE Directories (EXE before CHECK_OPTIONS).
-$!
-$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.TEST]
-$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.TEST]
+$ ARCHD = ARCH
+$ LIB32 = "32"
+$ OPT_FILE = ""
+$ POINTER_SIZE = ""
 $!
 $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
 $ GOSUB CHECK_OPTIONS
 $!
+$! Define The OBJ and EXE Directories.
+$!
+$ OBJ_DIR := SYS$DISK:[-.'ARCHD'.OBJ.TEST]
+$ EXE_DIR := SYS$DISK:[-.'ARCHD'.EXE.TEST]
+$!
+$! Specify the destination directory in any /MAP option.
+$!
+$ if (LINKMAP .eqs. "MAP")
+$ then
+$   LINKMAP = LINKMAP+ "=''EXE_DIR'"
+$ endif
+$!
+$! Add the location prefix to the linker options file name.
+$!
+$ if (OPT_FILE .nes. "")
+$ then
+$   OPT_FILE = EXE_DIR+ OPT_FILE
+$ endif
+$!
 $! Initialise logical names and such
 $!
 $ GOSUB INITIALISE
 $!
 $! Tell The User What Kind of Machine We Run On.
 $!
-$ WRITE SYS$OUTPUT "Compiling On ''ARCH'."
+$ WRITE SYS$OUTPUT "Host system architecture: ''ARCHD'"
 $!
 $! Define The CRYPTO-LIB We Are To Use.
 $!
-$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
+$ CRYPTO_LIB := SYS$DISK:[-.'ARCHD'.EXE.CRYPTO]SSL_LIBCRYPTO'LIB32'.OLB
 $!
 $! Define The SSL We Are To Use.
 $!
-$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
+$ SSL_LIB := SYS$DISK:[-.'ARCHD'.EXE.SSL]SSL_LIBSSL'LIB32'.OLB
 $!
 $! Create the OBJ and EXE Directories, if needed.
 $!
@@ -105,7 +146,7 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
                "MDC2TEST,RMDTEST,"+ -
                "RANDTEST,DHTEST,ENGINETEST,"+ -
                "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ -
-               "EVP_TEST,JPAKETEST"
+               "EVP_TEST,IGETEST,JPAKETEST,ASN1TEST"
 $! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well?
 $!
 $! Additional directory information.
@@ -139,8 +180,9 @@ $ T_D_EXPTEST    := [-.crypto.bn]
 $ T_D_DSATEST    := [-.crypto.dsa]
 $ T_D_RSA_TEST   := [-.crypto.rsa]
 $ T_D_EVP_TEST   := [-.crypto.evp]
-$ T_D_JPAKETEST  := [-.crypto.jpake]
 $ T_D_IGETEST    := [-.test]
+$ T_D_JPAKETEST  := [-.crypto.jpake]
+$ T_D_ASN1TEST   := [-.test]
 $!
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
@@ -223,33 +265,15 @@ $!
 $! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
 $! Check To See If We Are To Link With A Specific TCP/IP Library.
 $!
-$ IF (TCPIP_LIB.NES."")
-$ THEN
-$!
 $!  Don't Link With The RSAREF Routines And TCP/IP Library.
 $!
-$   LINK /'DEBUGGER' /'TRACEBACK' /EXECTABLE = 'EXE_FILE' -
-        'OBJECT_FILE', -
-        'SSL_LIB' /LIBRARY, -
-        'CRYPTO_LIB' /LIBRARY, -
-        'TCPIP_LIB', -
-        'OPT_FILE' /OPTIONS
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$!  Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
-$!
-$   LINK /'DEBUGGER' /'TRACEBACK' /EXECUTABLE = 'EXE_FILE' -
-        'OBJECT_FILE', -
-        'SSL_LIB' /LIBRARY, -
-        'CRYPTO_LIB' /LIBRARY, -
-        'OPT_FILE' /OPTIONS
-$!
-$! End The TCP/IP Library Check.
-$!
-$ ENDIF
+$ LINK /'DEBUGGER' /'LINKMAP' /'TRACEBACK' /EXECTABLE = 'EXE_FILE' -
+   'OBJECT_FILE', -
+   'SSL_LIB' /LIBRARY, -
+   'CRYPTO_LIB' /LIBRARY -
+   'TCPIP_LIB' -
+   'ZLIB_LIB' -
+   ,'OPT_FILE' /OPTIONS
 $!
 $! Go Back And Do It Again.
 $!
@@ -313,7 +337,7 @@ $!
 $     CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Agianst 
+! Default System Options File To Link Against 
 ! The Sharable C Runtime Library.
 !
 GNU_CC:[000000]GCCLIB.OLB /LIBRARY
@@ -348,7 +372,7 @@ $!
 $       CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Agianst 
+! Default System Options File To Link Against 
 ! The Sharable DEC C Runtime Library.
 !
 SYS$SHARE:DECC$SHR.EXE /SHAREABLE
@@ -363,7 +387,7 @@ $!
 $       CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File For non-VAX To Link Agianst 
+! Default System Options File For non-VAX To Link Against 
 ! The Sharable C Runtime Library.
 !
 SYS$SHARE:CMA$OPEN_LIB_SHR.EXE /SHAREABLE
@@ -442,19 +466,24 @@ $! Check The User's Options.
 $!
 $ CHECK_OPTIONS:
 $!
+$! Set basic C compiler /INCLUDE directories.
+$!
+$ CC_INCLUDES = "SYS$DISK:[-],SYS$DISK:[-.CRYPTO]"
+$!
 $! Check To See If P1 Is Blank.
 $!
 $ IF (P1.EQS."NODEBUG")
 $ THEN
 $!
-$!   P1 Is NODEBUG, So Compile Without Debugger Information.
+$!  P1 Is NODEBUG, So Compile Without Debugger Information.
 $!
-$    DEBUGGER  = "NODEBUG"
-$    TRACEBACK = "NOTRACEBACK" 
-$    GCC_OPTIMIZE = "OPTIMIZE"
-$    CC_OPTIMIZE = "OPTIMIZE"
-$    WRITE SYS$OUTPUT "No Debugger Information Will Be Produced During Compile."
-$    WRITE SYS$OUTPUT "Compiling With Compiler Optimization."
+$   DEBUGGER  = "NODEBUG"
+$   LINKMAP = "NOMAP"
+$   TRACEBACK = "NOTRACEBACK" 
+$   GCC_OPTIMIZE = "OPTIMIZE"
+$   CC_OPTIMIZE = "OPTIMIZE"
+$   WRITE SYS$OUTPUT "No Debugger Information Will Be Produced During Compile."
+$   WRITE SYS$OUTPUT "Compiling With Compiler Optimization."
 $!
 $! Else...
 $!
@@ -468,6 +497,7 @@ $!
 $!    Compile With Debugger Information.
 $!
 $     DEBUGGER  = "DEBUG"
+$     LINKMAP = "MAP"
 $     TRACEBACK = "TRACEBACK"
 $     GCC_OPTIMIZE = "NOOPTIMIZE"
 $     CC_OPTIMIZE = "NOOPTIMIZE"
@@ -478,7 +508,7 @@ $!  Else...
 $!
 $   ELSE
 $!
-$!    Tell The User Entered An Invalid Option..
+$!    Tell The User Entered An Invalid Option.
 $!
 $     WRITE SYS$OUTPUT ""
 $     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
@@ -491,11 +521,87 @@ $!    Time To EXIT.
 $!
 $     EXIT
 $!
-$!  End The Valid Arguement Check.
+$!  End The Valid Argument Check.
+$!
+$   ENDIF
+$!
+$! End The P1 Check.
+$!
+$ ENDIF
+$!
+$! Check P5 (POINTER_SIZE).
+$!
+$ IF (P5 .NES. "") .AND. (ARCH .NES. "VAX")
+$ THEN
+$!
+$   IF (P5 .EQS. "32")
+$   THEN
+$     POINTER_SIZE = " /POINTER_SIZE=32"
+$   ELSE
+$     POINTER_SIZE = F$EDIT( P5, "COLLAPSE, UPCASE")
+$     IF ((POINTER_SIZE .EQS. "64") .OR. -
+       (POINTER_SIZE .EQS. "64=") .OR. -
+       (POINTER_SIZE .EQS. "64=ARGV"))
+$     THEN
+$       ARCHD = ARCH+ "_64"
+$       LIB32 = ""
+$       IF (F$EXTRACT( 2, 1, POINTER_SIZE) .EQS. "=")
+$       THEN
+$!        Explicit user choice: "64" or "64=ARGV".
+$         IF (POINTER_SIZE .EQS. "64=") THEN POINTER_SIZE = "64"
+$       ELSE
+$         SET NOON
+$         DEFINE /USER_MODE SYS$OUTPUT NL:
+$         DEFINE /USER_MODE SYS$ERROR NL:
+$         CC /NOLIST /NOOBJECT /POINTER_SIZE=64=ARGV NL:
+$         IF ($STATUS .AND. %X0FFF0000) .EQ. %X00030000
+$         THEN
+$           ! If we got here, it means DCL complained like this:
+$           ! %DCL-W-NOVALU, value not allowed - remove value specification
+$           !  \64=\
+$           !
+$           ! If the compiler was run, logicals defined in /USER would
+$           ! have been deassigned automatically.  However, when DCL
+$           ! complains, they aren't, so we do it here (it might be
+$           ! unnecessary, but just in case there will be another error
+$           ! message further on that we don't want to miss)
+$           DEASSIGN /USER_MODE SYS$ERROR
+$           DEASSIGN /USER_MODE SYS$OUTPUT
+$         ELSE
+$           POINTER_SIZE = POINTER_SIZE + "=ARGV"
+$         ENDIF
+$         SET ON
+$       ENDIF
+$       POINTER_SIZE = " /POINTER_SIZE=''POINTER_SIZE'"
+$     ELSE
+$!
+$!      Tell The User Entered An Invalid Option.
+$!
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "The Option ", P5, -
+         " Is Invalid.  The Valid Options Are:"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT -
+         "    """"  :  Compile with default (short) pointers."
+$       WRITE SYS$OUTPUT -
+         "    32  :  Compile with 32-bit (short) pointers."
+$       WRITE SYS$OUTPUT -
+         "    64       :  Compile with 64-bit (long) pointers (auto ARGV)."
+$       WRITE SYS$OUTPUT -
+         "    64=      :  Compile with 64-bit (long) pointers (no ARGV)."
+$       WRITE SYS$OUTPUT -
+         "    64=ARGV  :  Compile with 64-bit (long) pointers (ARGV)."
+$       WRITE SYS$OUTPUT ""
+$! 
+$!      Time To EXIT.
+$!
+$       EXIT
+$!
+$     ENDIF
 $!
 $   ENDIF
 $!
-$! End The P2 Check.
+$! End The P5 (POINTER_SIZE) Check.
 $!
 $ ENDIF
 $!
@@ -599,11 +705,64 @@ $ CCDEFS = "TCPIP_TYPE_''P3'"
 $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
 $ CCEXTRAFLAGS = ""
 $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
-$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
+$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
 $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
         CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS
 $!
-$!  Check To See If The User Entered A Valid Paramter.
+$! Check To See If We Have A ZLIB Option.
+$!
+$ ZLIB = P6
+$ IF (ZLIB .NES. "")
+$ THEN
+$!
+$!  Check for expected ZLIB files.
+$!
+$   err = 0
+$   file1 = f$parse( "zlib.h", ZLIB, , , "SYNTAX_ONLY")
+$   if (f$search( file1) .eqs. "")
+$   then
+$     WRITE SYS$OUTPUT ""
+$     WRITE SYS$OUTPUT "The Option ", ZLIB, " Is Invalid."
+$     WRITE SYS$OUTPUT "    Can't find header: ''file1'"
+$     err = 1
+$   endif
+$   file1 = f$parse( "A.;", ZLIB)- "A.;"
+$!
+$   file2 = f$parse( ZLIB, "libz.olb", , , "SYNTAX_ONLY")
+$   if (f$search( file2) .eqs. "")
+$   then
+$     if (err .eq. 0)
+$     then
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "The Option ", ZLIB, " Is Invalid."
+$     endif
+$     WRITE SYS$OUTPUT "    Can't find library: ''file2'"
+$     WRITE SYS$OUTPUT ""
+$     err = err+ 2
+$   endif
+$   if (err .eq. 1)
+$   then
+$     WRITE SYS$OUTPUT ""
+$   endif
+$!
+$   if (err .ne. 0)
+$   then
+$     GOTO EXIT
+$   endif
+$!
+$   CCDEFS = """ZLIB=1"", "+ CCDEFS
+$   CC_INCLUDES = CC_INCLUDES+ ", "+ file1
+$   ZLIB_LIB = ", ''file2' /library"
+$!
+$!  Print info
+$!
+$   WRITE SYS$OUTPUT "ZLIB library spec: ", file2
+$!
+$! End The P8 Check.
+$!
+$ ENDIF
+$!
+$!  Check To See If The User Entered A Valid Parameter.
 $!
 $ IF (P2.EQS."VAXC").OR.(P2.EQS."DECC").OR.(P2.EQS."GNUC")
 $ THEN
@@ -626,13 +785,13 @@ $!
 $     CC = "CC"
 $     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
          THEN CC = "CC /DECC"
-$     CC = CC + "/''CC_OPTIMIZE' /''DEBUGGER' /STANDARD=ANSI89" + -
-           "/NOLIST /PREFIX=ALL" + -
-           "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
+$     CC = CC + " /''CC_OPTIMIZE' /''DEBUGGER' /STANDARD=RELAXED"+ -
+       "''POINTER_SIZE' /NOLIST /PREFIX=ALL" + -
+       " /INCLUDE=(''CC_INCLUDES') " + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "''EXE_DIR'VAX_DECC_OPTIONS.OPT"
+$     OPT_FILE = "VAX_DECC_OPTIONS.OPT"
 $!
 $!  End DECC Check.
 $!
@@ -661,7 +820,7 @@ $	EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC /VAXC"
 $     CC = CC + "/''CC_OPTIMIZE' /''DEBUGGER' /NOLIST" + -
-           "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
+           "/INCLUDE=(''CC_INCLUDES')" + CCEXTRAFLAGS
 $     CCDEFS = CCDEFS + ",""VAXC"""
 $!
 $!    Define <sys> As SYS$COMMON:[SYSLIB]
@@ -670,7 +829,7 @@ $     DEFINE /NOLOG SYS SYS$COMMON:[SYSLIB]
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "''EXE_DIR'VAX_VAXC_OPTIONS.OPT"
+$     OPT_FILE = "VAX_VAXC_OPTIONS.OPT"
 $!
 $!  End VAXC Check
 $!
@@ -692,11 +851,11 @@ $!
 $!    Use GNU C...
 $!
 $     CC = "GCC /NOCASE_HACK /''GCC_OPTIMIZE' /''DEBUGGER' /NOLIST" + -
-           "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
+           "/INCLUDE=(''CC_INCLUDES')" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "''EXE_DIR'VAX_GNUC_OPTIONS.OPT"
+$     OPT_FILE = "VAX_GNUC_OPTIONS.OPT"
 $!
 $!  End The GNU C Check.
 $!
@@ -715,20 +874,20 @@ $     THEN
 $       CC4DISABLEWARNINGS = "DOLLARID"
 $     ELSE
 $       CC4DISABLEWARNINGS = CCDISABLEWARNINGS + ",DOLLARID"
-$       CCDISABLEWARNINGS = "/WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"
+$       CCDISABLEWARNINGS = " /WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"
 $     ENDIF
-$     CC4DISABLEWARNINGS = "/WARNING=(DISABLE=(" + CC4DISABLEWARNINGS + "))"
+$     CC4DISABLEWARNINGS = " /WARNING=(DISABLE=(" + CC4DISABLEWARNINGS + "))"
 $   ELSE
 $     CCDISABLEWARNINGS = ""
 $     CC4DISABLEWARNINGS = ""
 $   ENDIF
-$   CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
+$   CC = CC + " /DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
 $!
 $!  Show user the result
 $!
 $   WRITE /SYMBOL SYS$OUTPUT "Main Compiling Command: ", CC
 $!
-$!  Else The User Entered An Invalid Arguement.
+$!  Else The User Entered An Invalid Argument.
 $!
 $ ELSE
 $!
@@ -760,7 +919,7 @@ $   THEN
 $!
 $!    Set the library to use SOCKETSHR
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT /OPTIONS"
+$     TCPIP_LIB = ",SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT /OPTIONS"
 $!
 $!    Done with SOCKETSHR
 $!
@@ -786,13 +945,13 @@ $   THEN
 $!
 $!    Set the library to use UCX.
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT /OPTIONS"
+$     TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT /OPTIONS"
 $     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
 $     THEN
-$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT /OPTIONS"
+$       TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT /OPTIONS"
 $     ELSE
 $       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
-          TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT /OPTIONS"
+          TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT /OPTIONS"
 $     ENDIF
 $!
 $!    Done with UCX
@@ -806,7 +965,7 @@ $   THEN
 $!
 $!    Set the library to use TCPIP (post UCX).
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT /OPTIONS"
+$     TCPIP_LIB = ",SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT /OPTIONS"
 $!
 $!    Done with TCPIP
 $!
@@ -827,9 +986,9 @@ $   ENDIF
 $!
 $!  Print info
 $!
-$   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
+$   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB- ","
 $!
-$!  Else The User Entered An Invalid Arguement.
+$!  Else The User Entered An Invalid Argument.
 $!
 $ ELSE
 $!
diff --git a/src/lib/libssl/test/tcrl.com b/src/lib/libssl/test/tcrl.com
index 1f606eb850..dd96a2b6dd 100644
--- a/src/lib/libssl/test/tcrl.com
+++ b/src/lib/libssl/test/tcrl.com
@@ -1,14 +1,17 @@
 $! TCRL.COM  --  Tests crl keys
 $
-$       __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 (p2 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
-$       cmd := mcr 'exe_dir'openssl crl
+$       cmd = "mcr ''exe_dir'openssl crl"
 $
-$       t := testcrl.pem
+$       t = "testcrl.pem"
 $       if p1 .nes. "" then t = p1
 $
 $       write sys$output "testing CRL conversions"
diff --git a/src/lib/libssl/test/testca.com b/src/lib/libssl/test/testca.com
index ec7e56dad6..78cda9ec5a 100644
--- a/src/lib/libssl/test/testca.com
+++ b/src/lib/libssl/test/testca.com
@@ -1,11 +1,13 @@
 $! TESTCA.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"
 $
-$       openssl := mcr 'exe_dir'openssl
+$       openssl = "mcr ''exe_dir'openssl"
 $
 $       SSLEAY_CONFIG="-config ""CAss.cnf"""
 $
diff --git a/src/lib/libssl/test/testenc.com b/src/lib/libssl/test/testenc.com
index 621d9a2126..75acd6f07f 100644
--- a/src/lib/libssl/test/testenc.com
+++ b/src/lib/libssl/test/testenc.com
@@ -1,13 +1,16 @@
 $! TESTENC.COM  --  Test encoding and decoding
 $
-$       __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"
 $
-$       testsrc := makefile.
-$       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"
 $
 $       if f$search(test) .nes. "" then delete 'test';*
 $       convert/fdl=sys$input: 'testsrc' 'test'
diff --git a/src/lib/libssl/test/testgen.com b/src/lib/libssl/test/testgen.com
index a4bc574bec..e076da2f30 100644
--- a/src/lib/libssl/test/testgen.com
+++ b/src/lib/libssl/test/testgen.com
@@ -1,14 +1,15 @@
-$! TETSGEN.COM
+$! TESTGEN.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]"
 $
-$       T := testcert
+$       T = "testcert"
 $       KEY = 512
-$       CA := [-.certs]testca.pem
+$       CA = "[-.certs]testca.pem"
 $
 $       set noon
 $       if f$search(T+".1;*") .nes. "" then delete 'T'.1;*
@@ -20,7 +21,8 @@ $	write sys$output "generating certificate request"
 $
 $       append/new nl: .rnd
 $       open/append random_file .rnd
-$       write random_file "string to make the random number generator think it has entropy"
+$       write random_file -
+         "string to make the random number generator think it has entropy"
 $       close random_file
 $
 $       set noon
@@ -33,8 +35,10 @@ $	then
 $           req_new="-newkey dsa:[-.apps]dsa512.pem"
 $       else
 $           req_new="-new"
-$           write sys$output "There should be a 2 sequences of .'s and some +'s."
-$           write sys$output "There should not be more that at most 80 per line"
+$           write sys$output -
+             "There should be a 2 sequences of .'s and some +'s."
+$           write sys$output -
+             "There should not be more that at most 80 per line"
 $       endif
 $
 $       write sys$output "This could take some time."
diff --git a/src/lib/libssl/test/tests.com b/src/lib/libssl/test/tests.com
index d151cd3955..373dd16eac 100644
--- a/src/lib/libssl/test/tests.com
+++ b/src/lib/libssl/test/tests.com
@@ -1,22 +1,43 @@
 $! TESTS.COM  --  Performs the necessary tests
 $!
 $! P1   tests to be performed.  Empty means all.
-$
+$! P2   Pointer size: "", "32", or "64".
+$!
+$! Announce/identify.
+$!
+$       proc = f$environment( "procedure")
+$       write sys$output "@@@ "+ -
+         f$parse( proc, , , "name")+ f$parse( proc, , , "type")
+$!
 $       __proc = f$element(0,";",f$environment("procedure"))
 $       __here = f$parse(f$parse("A.;",__proc) - "A.;","[]A.;") - "A.;"
 $       __save_default = f$environment("default")
-$       __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]
-$
-$       sslroot = f$parse("sys$disk:[-.apps];",,,,"syntax_only") - "].;"+ ".]"
-$       define /translation_attributes = concealed sslroot 'sslroot'
+$       if __arch .eqs. "" then __arch = "UNK"
+$!
+$       __archd = __arch
+$       pointer_size = ""
+$       if (p2 .eq. "64")
+$       then
+$         pointer_size = "64"
+$         __archd = __arch+ "_64"
+$       endif
+$!
+$       texe_dir := sys$disk:[-.'__archd'.exe.test]
+$       exe_dir := sys$disk:[-.'__archd'.exe.apps]
 $
 $       set default '__here'
 $
+$       ROOT = F$PARSE("sys$disk:[-]A.;0",,,,"SYNTAX_ONLY,NO_CONCEAL") - "A.;0"
+$       ROOT_DEV = F$PARSE(ROOT,,,"DEVICE","SYNTAX_ONLY")
+$       ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
+                   - ".][000000" - "[000000." - "][" - "[" - "]"
+$       ROOT = ROOT_DEV + "[" + ROOT_DIR
+$       DEFINE/NOLOG SSLROOT 'ROOT'.APPS.] /TRANS=CONC
+$       openssl_conf := sslroot:[000000]openssl-vms.cnf
+$
 $       on control_y then goto exit
 $       on error then goto exit
 $
@@ -70,17 +91,19 @@ $	ENGINETEST :=	enginetest
 $       EVPTEST :=      evp_test
 $       IGETEST :=      igetest
 $       JPAKETEST :=    jpaketest
-$
+$       ASN1TEST :=     asn1test
+$!
 $       tests_i = 0
 $ loop_tests:
 $       tests_e = f$element(tests_i,",",tests)
 $       tests_i = tests_i + 1
 $       if tests_e .eqs. "," then goto exit
+$       write sys$output "---> ''tests_e'"
 $       gosub 'tests_e'
 $       goto loop_tests
 $
 $ test_evp:
-$       mcr 'texe_dir''evptest' evptests.txt
+$       mcr 'texe_dir''evptest' 'ROOT'.CRYPTO.EVP]evptests.txt
 $       return
 $ test_des:
 $       mcr 'texe_dir''destest'
@@ -132,68 +155,109 @@ $ test_rand:
 $       mcr 'texe_dir''randtest'
 $       return
 $ test_enc:
-$       @testenc.com
+$       @testenc.com 'pointer_size'
 $       return
 $ test_x509:
-$       define sys$error nla0:
+$       set noon
+$       define sys$error test_x509.err
 $       write sys$output "test normal x509v1 certificate"
-$       @tx509.com
+$       @tx509.com "" 'pointer_size'
 $       write sys$output "test first x509v3 certificate"
-$       @tx509.com v3-cert1.pem
+$       @tx509.com v3-cert1.pem 'pointer_size'
 $       write sys$output "test second x509v3 certificate"
-$       @tx509.com v3-cert2.pem
+$       @tx509.com v3-cert2.pem 'pointer_size'
 $       deassign sys$error
+$       set on
 $       return
 $ test_rsa:
-$       define sys$error nla0:
-$       @trsa.com
+$       set noon
+$       define sys$error test_rsa.err
+$       @trsa.com "" 'pointer_size'
 $       deassign sys$error
 $       mcr 'texe_dir''rsatest'
+$       set on
 $       return
 $ test_crl:
-$       define sys$error nla0:
-$       @tcrl.com
+$       set noon
+$       define sys$error test_crl.err
+$       @tcrl.com "" 'pointer_size'
 $       deassign sys$error
+$       set on
 $       return
 $ test_sid:
-$       define sys$error nla0:
-$       @tsid.com
+$       set noon
+$       define sys$error test_sid.err
+$       @tsid.com "" 'pointer_size'
 $       deassign sys$error
+$       set on
 $       return
 $ test_req:
-$       define sys$error nla0:
-$       @treq.com
-$       @treq.com testreq2.pem
+$       set noon
+$       define sys$error test_req.err
+$       @treq.com "" 'pointer_size'
+$       @treq.com testreq2.pem 'pointer_size'
 $       deassign sys$error
+$       set on
 $       return
 $ test_pkcs7:
-$       define sys$error nla0:
-$       @tpkcs7.com
-$       @tpkcs7d.com
+$       set noon
+$       define sys$error test_pkcs7.err
+$       @tpkcs7.com "" 'pointer_size'
+$       @tpkcs7d.com "" 'pointer_size'
 $       deassign sys$error
+$       set on
 $       return
 $ test_bn:
-$       write sys$output "starting big number library test, could take a while..."
-$       create bntest-vms.fdl
+$       write sys$output -
+              "starting big number library test, could take a while..."
+$       set noon
+$       define sys$error test_bn.err
+$       define sys$output test_bn.out
+$       @ bctest.com
+$       status = $status
+$       deassign sys$error
+$       deassign sys$output
+$       set on
+$       if (status)
+$       then
+$           create /fdl = sys$input bntest-vms.tmp
+FILE
+        ORGANIZATION    sequential
+RECORD
+        FORMAT          stream_lf
+$           define /user_mode sys$output bntest-vms.tmp
+$           mcr 'texe_dir''bntest'
+$           define /user_mode sys$input bntest-vms.tmp
+$           define /user_mode sys$output bntest-vms.out
+$           bc
+$           @ bntest.com bntest-vms.out
+$           status = $status
+$           if (status)
+$           then
+$               delete bntest-vms.out;*
+$               delete bntest-vms.tmp;*
+$           endif
+$       else
+$           create /fdl = sys$input bntest-vms.sh
 FILE
         ORGANIZATION    sequential
 RECORD
         FORMAT          stream_lf
-$       create/fdl=bntest-vms.fdl bntest-vms.sh
-$       open/append foo bntest-vms.sh
-$       type/output=foo: sys$input:
+$           open /append bntest_file bntest-vms.sh
+$           type /output = bntest_file sys$input:
 << __FOO__ sh -c "`sh ./bctest`" | perl -e '$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $1";} elsif (!/^0$/) {die "\nFailed! bc: $_";} else {print STDERR "."; $i++;}} print STDERR "\n$i tests passed\n"'
-$       define/user sys$output bntest-vms.tmp
-$       mcr 'texe_dir''bntest'
-$       copy bntest-vms.tmp foo:
-$       delete bntest-vms.tmp;*
-$       type/output=foo: sys$input:
+$           define /user_mode sys$output bntest-vms.tmp
+$           mcr 'texe_dir''bntest'
+$           copy bntest-vms.tmp bntest_file
+$           delete bntest-vms.tmp;*
+$           type /output = bntest_file sys$input:
 __FOO__
-$       close foo
-$       write sys$output "-- copy the [.test]bntest-vms.sh and [.test]bctest files to a Unix system and"
-$       write sys$output "-- run bntest-vms.sh through sh or bash to verify that the bignum operations"
-$       write sys$output "-- went well."
-$       write sys$output ""
+$           close bntest_file
+$           write sys$output "-- copy the [.test]bntest-vms.sh and [.test]bctest files to a Unix system and"
+$           write sys$output "-- run bntest-vms.sh through sh or bash to verify that the bignum operations"
+$           write sys$output "-- went well."
+$           write sys$output ""
+$       endif
 $       write sys$output "test a^b%c implementations"
 $       mcr 'texe_dir''exptest'
 $       return
@@ -212,7 +276,7 @@ $	return
 $ test_verify:
 $       write sys$output "The following command should have some OK's and some failures"
 $       write sys$output "There are definitly a few expired certificates"
-$       @tverify.com
+$       @tverify.com 'pointer_size'
 $       return
 $ test_dh:
 $       write sys$output "Generate a set of DH parameters"
@@ -224,7 +288,7 @@ $	mcr 'texe_dir''dsatest'
 $       return
 $ test_gen:
 $       write sys$output "Generate and verify a certificate request"
-$       @testgen.com
+$       @testgen.com 'pointer_size'
 $       return
 $ maybe_test_ss:
 $       testss_RDT = f$cvtime(f$file_attributes("testss.com","RDT"))
@@ -237,7 +301,7 @@ $	if f$cvtime(f$file_attributes("certCA.ss","RDT")) .les. testss_RDT then -
 $       return
 $ test_ss:
 $       write sys$output "Generate and certify a test certificate"
-$       @testss.com
+$       @testss.com 'pointer_size'
 $       return
 $ test_engine: 
 $       write sys$output "Manipulate the ENGINE structures"
@@ -246,11 +310,11 @@ $	return
 $ test_ssl:
 $       write sys$output "test SSL protocol"
 $       gosub maybe_test_ss
-$       @testssl.com keyU.ss certU.ss certCA.ss
+$       @testssl.com keyU.ss certU.ss certCA.ss 'pointer_size'
 $       return
 $ test_ca:
 $       set noon
-$       define/user sys$output nla0:
+$       define /user_mode sys$output test_ca.out
 $       mcr 'exe_dir'openssl no-rsa
 $       save_severity=$SEVERITY
 $       set on
@@ -259,7 +323,7 @@ $	then
 $           write sys$output "skipping CA.com test -- requires RSA"
 $       else
 $           write sys$output "Generate and certify a test certificate via the 'ca' program"
-$           @testca.com
+$           @testca.com 'pointer_size'
 $       endif
 $       return
 $ test_aes: 
@@ -268,7 +332,7 @@ $!	!mcr 'texe_dir''aestest'
 $       return
 $ test_tsa:
 $       set noon
-$       define/user sys$output nla0:
+$       define /user_mode sys$output nla0:
 $       mcr 'exe_dir'openssl no-rsa
 $       save_severity=$SEVERITY
 $       set on
@@ -276,7 +340,7 @@ $	if save_severity
 $       then
 $           write sys$output "skipping testtsa.com test -- requires RSA"
 $       else
-$           @testtsa.com
+$           @testtsa.com "" "" "" 'pointer_size'
 $       endif
 $       return
 $ test_ige: 
@@ -289,11 +353,14 @@ $	mcr 'texe_dir''jpaketest'
 $       return
 $ test_cms:
 $       write sys$output "CMS consistency test"
+$       ! Define the logical name used to find openssl.exe in the perl script.
+$       define /user_mode osslx 'exe_dir'
 $       perl CMS-TEST.PL
 $       return
 $
 $
 $ exit:
+$       mcr 'exe_dir'openssl version -a
 $       set default '__save_default'
 $       deassign sslroot
 $       exit
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"""
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'
diff --git a/src/lib/libssl/test/tpkcs7.com b/src/lib/libssl/test/tpkcs7.com
index e107cc141a..3fc4982bb0 100644
--- a/src/lib/libssl/test/tpkcs7.com
+++ b/src/lib/libssl/test/tpkcs7.com
@@ -1,14 +1,17 @@
 $! TPKCS7.COM  --  Tests pkcs7 keys
 $
-$       __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 (p2 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
-$       cmd := mcr 'exe_dir'openssl pkcs7
+$       cmd = "mcr ''exe_dir'openssl pkcs7"
 $
-$       t := testp7.pem
+$       t = "testp7.pem"
 $       if p1 .nes. "" then t = p1
 $
 $       write sys$output "testing PKCS7 conversions"
diff --git a/src/lib/libssl/test/tpkcs7d.com b/src/lib/libssl/test/tpkcs7d.com
index 5ff653ccee..eea8c888ee 100644
--- a/src/lib/libssl/test/tpkcs7d.com
+++ b/src/lib/libssl/test/tpkcs7d.com
@@ -1,14 +1,17 @@
 $! TPKCS7.COM  --  Tests pkcs7 keys
 $
-$       __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 (p2 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
-$       cmd := mcr 'exe_dir'openssl pkcs7
+$       cmd = "mcr ''exe_dir'openssl pkcs7"
 $
-$       t := pkcs7-1.pem
+$       t = "pkcs7-1.pem"
 $       if p1 .nes. "" then t = p1
 $
 $       write sys$output "testing PKCS7 conversions (2)"
diff --git a/src/lib/libssl/test/treq.com b/src/lib/libssl/test/treq.com
index d2594be6a7..acf08b79ef 100644
--- a/src/lib/libssl/test/treq.com
+++ b/src/lib/libssl/test/treq.com
@@ -1,14 +1,17 @@
 $! TREQ.COM  --  Tests req keys
 $
-$       __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 (p2 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
-$       cmd := mcr 'exe_dir'openssl req -config [-.apps]openssl-vms.cnf
+$       cmd = "mcr ''exe_dir'openssl req -config [-.apps]openssl-vms.cnf"
 $
-$       t := testreq.pem
+$       t = "testreq.pem"
 $       if p1 .nes. "" then t = p1
 $
 $       write sys$output "testing req conversions"
diff --git a/src/lib/libssl/test/trsa.com b/src/lib/libssl/test/trsa.com
index d3a8a605b7..54180843ee 100644
--- a/src/lib/libssl/test/trsa.com
+++ b/src/lib/libssl/test/trsa.com
@@ -1,10 +1,13 @@
 $! TRSA.COM  --  Tests rsa keys
 $
-$       __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 (p2 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
 $       set noon
 $       define/user sys$output nla0:
@@ -17,9 +20,9 @@ $	    write sys$output "skipping RSA conversion test"
 $           exit
 $       endif
 $
-$       cmd := mcr 'exe_dir'openssl rsa
+$       cmd = "mcr ''exe_dir'openssl rsa"
 $
-$       t := testrsa.pem
+$       t = "testrsa.pem"
 $       if p1 .nes. "" then t = p1
 $
 $       write sys$output "testing RSA conversions"
diff --git a/src/lib/libssl/test/tsid.com b/src/lib/libssl/test/tsid.com
index 267ace1135..b6c4e49473 100644
--- a/src/lib/libssl/test/tsid.com
+++ b/src/lib/libssl/test/tsid.com
@@ -1,14 +1,17 @@
 $! TSID.COM  --  Tests sid keys
 $
-$       __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 (p2 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
-$       cmd := mcr 'exe_dir'openssl sess_id
+$       cmd = "mcr ''exe_dir'openssl sess_id"
 $
-$       t := testsid.pem
+$       t = "testsid.pem"
 $       if p1 .nes. "" then t = p1
 $
 $       write sys$output "testing session-id conversions"
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))
diff --git a/src/lib/libssl/test/tx509.com b/src/lib/libssl/test/tx509.com
index 399eb01490..93ce988b41 100644
--- a/src/lib/libssl/test/tx509.com
+++ b/src/lib/libssl/test/tx509.com
@@ -1,14 +1,17 @@
 $! TX509.COM  --  Tests x509 certificates
 $
-$       __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 (p2 .eqs. "64") then __arch = __arch+ "_64"
+$!
+$       exe_dir = "sys$disk:[-.''__arch'.exe.apps]"
 $
-$       cmd := mcr 'exe_dir'openssl x509
+$       cmd = "mcr ''exe_dir'openssl x509"
 $
-$       t := testx509.pem
+$       t = "testx509.pem"
 $       if p1 .nes. "" then t = p1
 $
 $       write sys$output "testing X509 conversions"