Final (for this commit series) optimized version and with commentary section.

[openssl.git] / test / maketests.com

diff --git a/test/maketests.com b/test/maketests.com
index 3eba56eb1ef4514049b90a5afe764cf6a3cd246a..103b2110442e0d5ad600e5858da4294a50eb21ca 100644 (file)
--- a/test/maketests.com
+++ b/test/maketests.com
@@ -16,22 +16,10 @@ $!  The test "executeables" will be placed in a directory called
 $!  [.xxx.EXE.TEST] where "xxx" denotes AXP or VAX depending on your machines
 $!  architecture.
 $!
 $!  [.xxx.EXE.TEST] where "xxx" denotes AXP or VAX depending on your machines
 $!  architecture.
 $!

-$!  Specify RSAREF as P1 to compile with the RSAREF library instead of
-$!  the regular one.  If you specify NORSAREF it will compile with the
-$!  regular RSAREF routines.  (Note: If you are in the United States
-$!  you MUST compile with RSAREF unless you have a license from RSA).
-$!
-$!  Note: The RSAREF libraries are NOT INCLUDED and you have to
-$!        download it from "ftp://ftp.rsa.com/rsaref".  You have to
-$!        get the ".tar-Z" file as the ".zip" file dosen't have the
-$!        directory structure stored.  You have to extract the file
-$!        into the [.RSAREF] directory under the root directory as that
-$!        is where the scripts will look for the files.
-$!
-$!  Specify DEBUG or NODEBUG P2 to compile with or without debugger
+$!  Specify DEBUG or NODEBUG P1 to compile with or without debugger

 $!  information.
 $!
 $!  information.
 $!

-$!  Specify which compiler at P3 to try to compile under.
+$!  Specify which compiler at P2 to try to compile under.

 $!
 $!        VAXC  For VAX C.
 $!        DECC  For DEC C.
 $!
 $!        VAXC  For VAX C.
 $!        DECC  For DEC C.


@@ -40,13 +28,13 @@ $!
 $!  If you don't speficy a compiler, it will try to determine which
 $!  "C" compiler to use.
 $!
 $!  If you don't speficy a compiler, it will try to determine which
 $!  "C" compiler to use.
 $!

-$!  P4, if defined, sets a TCP/IP library to use, through one of the following
+$!  P3, if defined, sets a TCP/IP library to use, through one of the following

 $!  keywords:
 $!
 $!     UCX             for UCX
 $!     SOCKETSHR       for SOCKETSHR+NETLIB
 $!
 $!  keywords:
 $!
 $!     UCX             for UCX
 $!     SOCKETSHR       for SOCKETSHR+NETLIB
 $!

-$!  P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
+$!  P4, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)

 $!
 $!
 $! Define A TCP/IP Library That We Will Need To Link To.
 $!
 $!
 $! Define A TCP/IP Library That We Will Need To Link To.


@@ -91,10 +79,6 @@ $! Define The CRYPTO-LIB We Are To Use.
 $!
 $ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
 $!
 $!
 $ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
 $!

-$! Define The RSAREF-LIB We Are To Use.
-$!
-$ RSAREF_LIB := SYS$DISK:[-.'ARCH'.EXE.RSAREF]LIBRSAGLUE.OLB
-$!

 $! Define The SSL We Are To Use.
 $!
 $ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
 $! Define The SSL We Are To Use.
 $!
 $ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB


@@ -143,11 +127,14 @@ $ GOSUB CHECK_OPT_FILE
 $!
 $! Define The TEST Files.
 $!
 $!
 $! Define The TEST Files.
 $!

-$ TEST_FILES = "BNTEST,IDEATEST,MD2TEST,MD4TEST,MD5TEST,HMACTEST,"+ -
+$ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
+              "MD2TEST,MD4TEST,MD5TEST,HMACTEST,WP_TEST,"+ -

               "RC2TEST,RC4TEST,RC5TEST,"+ -
               "RC2TEST,RC4TEST,RC5TEST,"+ -

-              "DESTEST,SHATEST,SHA1TEST,MDC2TEST,RMDTEST,"+ -
-              "RANDTEST,DHTEST,"+ -
-              "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,ENGINETEST"
+              "DESTEST,SHATEST,SHA1TEST,SHA256T,SHA512T,"+ -
+              "MDC2TEST,RMDTEST,"+ -
+              "RANDTEST,DHTEST,ENGINETEST,"+ -
+              "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ -
+              "EVP_TEST"

 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
      TCPIP_PROGRAMS = ",SSLTEST,"
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
      TCPIP_PROGRAMS = ",SSLTEST,"


@@ -226,74 +213,32 @@ $!
 $ ENDIF
 $!
 $! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
 $ ENDIF
 $!
 $! 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 (RSAREF.EQS."TRUE")
+$ IF (TCPIP_LIB.NES."")

 $ THEN
 $!
 $ THEN
 $!

-$!  Check To See If We Are To Link With A Specific TCP/IP Library.
-$!
-$   IF (TCPIP_LIB.NES."")
-$   THEN
-$!
-$!    Link With The RSAREF Library And A Specific TCP/IP Library.
-$!
-$     LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
-         'OBJECT_FILE',-
-         'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
-          'TCPIP_LIB','OPT_FILE'/OPTION
-$!
-$!  Else...
-$!
-$   ELSE
-$!
-$!    Link With The RSAREF Library And NO TCP/IP Library.
-$!
-$     LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
-         'OBJECT_FILE', -
-          'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
-          'OPT_FILE'/OPTION
-$!
-$!  End The TCP/IP Library Check.
-$!
-$   ENDIF
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$!  Don't Link With The RSAREF Routines.
-$!
-$!
-$!  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.
+$!  Don't Link With The RSAREF Routines And TCP/IP Library.

 $!
 $   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
        'OBJECT_FILE', -
         'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
         'TCPIP_LIB','OPT_FILE'/OPTION
 $!
 $!
 $   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
        'OBJECT_FILE', -
         'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
         'TCPIP_LIB','OPT_FILE'/OPTION
 $!

-$!  Else...
+$! Else...

 $!
 $!

-$   ELSE
+$ ELSE

 $!
 $!

-$!    Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
+$!  Don't Link With The RSAREF Routines And Link With A TCP/IP Library.

 $!
 $   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
        'OBJECT_FILE', -
         'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
         'OPT_FILE'/OPTION
 $!
 $!
 $   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
        'OBJECT_FILE', -
         'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
         'OPT_FILE'/OPTION
 $!

-$!  End The TCP/IP Library Check.
-$!
-$   ENDIF
-$!
-$! End The RSAREF Link Check.
+$! End The TCP/IP Library Check.

 $!
 $!

-$ ENDIF 
+$ ENDIF

 $!
 $! Go Back And Do It Again.
 $!
 $!
 $! Go Back And Do It Again.
 $!


@@ -458,32 +403,6 @@ $! End The Crypto Library Check.
 $!
 $ ENDIF
 $!
 $!
 $ ENDIF
 $!

-$! See If We Need The RSAREF Library...
-$!
-$ IF (RSAREF.EQS."TRUE")
-$ THEN
-$!
-$!  Look For The Library LIBRSAGLUE.OLB.
-$!
-$   IF (F$SEARCH(RSAREF_LIB).EQS."")
-$   THEN
-$!
-$!    Tell The User We Can't Find The LIBRSAGLUE.OLB Library.
-$!
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "Can't Find The Library ",RSAREF_LIB,"."
-$     WRITE SYS$OUTPUT "We Can't Link Without It."
-$     WRITE SYS$OUTPUT ""
-$!
-$!    Since We Can't Link Without It, Exit.
-$!
-$     EXIT
-$   ENDIF
-$!
-$! End The RSAREF Library Check.
-$!
-$ ENDIF
-$!

 $! Look For The Library LIBSSL.OLB.
 $!
 $ IF (F$SEARCH(SSL_LIB).EQS."")
 $! Look For The Library LIBSSL.OLB.
 $!
 $ IF (F$SEARCH(SSL_LIB).EQS."")


@@ -514,74 +433,10 @@ $ CHECK_OPTIONS:
 $!
 $! Check To See If P1 Is Blank.
 $!
 $!
 $! Check To See If P1 Is Blank.
 $!

-$ IF (P1.EQS."NORSAREF")
+$ IF (P1.EQS."NODEBUG")

 $ THEN
 $!
 $ THEN
 $!

-$!   P1 Is NORSAREF, So Compile With The Regular RSA Libraries.
-$!
-$    RSAREF = "FALSE"
-$ ELSE
-$!
-$!  Check To See If We Are To Use The RSAREF Library.
-$!
-$   IF (P1.EQS."RSAREF")
-$   THEN
-$!
-$!    Check To Make Sure We Have The RSAREF Source Code Directory.
-$!
-$     IF (F$SEARCH("SYS$DISK:[-.RSAREF]SOURCE.DIR").EQS."")
-$     THEN
-$!
-$!      We Don't Have The RSAREF Souce Code Directory, So Tell The
-$!      User This.
-$!
-$       WRITE SYS$OUTPUT ""
-$       WRITE SYS$OUTPUT "It appears that you don't have the RSAREF Souce Code."
-$       WRITE SYS$OUTPUT "You need to go to 'ftp://ftp.rsa.com/rsaref'.  You have to"
-$       WRITE SYS$OUTPUT "get the '.tar-Z' file as the '.zip' file dosen't have the"
-$       WRITE SYS$OUTPUT "directory structure stored.  You have to extract the file"
-$       WRITE SYS$OUTPUT "into the [.RSAREF] directory under the root directory"
-$       WRITE SYS$OUTPUT "as that is where the scripts will look for the files."
-$       WRITE SYS$OUTPUT ""
-$!
-$!      Time To Exit.
-$!
-$       EXIT
-$!
-$!    Else, Compile Using The RSAREF Library.
-$!
-$     ELSE
-$       RSAREF = "TRUE"
-$     ENDIF
-$   ELSE 
-$!
-$!    They Entered An Invalid Option..
-$!
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "     RSAREF   :  Compile With The RSAREF Library."
-$     WRITE SYS$OUTPUT "     NORSAREF :  Compile With The Regular RSA Library."
-$     WRITE SYS$OUTPUT ""
-$!
-$!    Time To EXIT.
-$!
-$     EXIT
-$!
-$!  End The Valid Arguement Check.
-$!
-$   ENDIF
-$!
-$! End The P1 Check.
-$!
-$ ENDIF
-$!
-$! Check To See If P2 Is Blank.
-$!
-$ IF (P2.EQS."NODEBUG")
-$ THEN
-$!
-$!   P2 Is NODEBUG, So Compile Without Debugger Information.
+$!   P1 Is NODEBUG, So Compile Without Debugger Information.

 $!
 $    DEBUGGER  = "NODEBUG"
 $    TRACEBACK = "NOTRACEBACK" 
 $!
 $    DEBUGGER  = "NODEBUG"
 $    TRACEBACK = "NOTRACEBACK" 


@@ -596,7 +451,7 @@ $ ELSE
 $!
 $!  Check To See If We Are To Compile With Debugger Information.
 $!
 $!
 $!  Check To See If We Are To Compile With Debugger Information.
 $!

-$   IF (P2.EQS."DEBUG")
+$   IF (P1.EQS."DEBUG")

 $   THEN
 $!
 $!    Compile With Debugger Information.
 $   THEN
 $!
 $!    Compile With Debugger Information.


@@ -615,7 +470,7 @@ $!
 $!    Tell The User Entered An Invalid Option..
 $!
 $     WRITE SYS$OUTPUT ""
 $!    Tell The User Entered An Invalid Option..
 $!
 $     WRITE SYS$OUTPUT ""

-$     WRITE SYS$OUTPUT "The Option ",P2," Is Invalid.  The Valid Options Are:"
+$     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"

 $     WRITE SYS$OUTPUT ""
 $     WRITE SYS$OUTPUT "    DEBUG    :  Compile With The Debugger Information."
 $     WRITE SYS$OUTPUT "    NODEBUG  :  Compile Without The Debugger Information."
 $     WRITE SYS$OUTPUT ""
 $     WRITE SYS$OUTPUT "    DEBUG    :  Compile With The Debugger Information."
 $     WRITE SYS$OUTPUT "    NODEBUG  :  Compile Without The Debugger Information."


@@ -629,13 +484,13 @@ $!  End The Valid Arguement Check.
 $!
 $   ENDIF
 $!
 $!
 $   ENDIF
 $!

-$! End The P3 Check.
+$! End The P2 Check.

 $!
 $ ENDIF
 $!
 $!
 $ ENDIF
 $!

-$! Check To See If P3 Is Blank.
+$! Check To See If P2 Is Blank.

 $!
 $!

-$ IF (P3.EQS."")
+$ IF (P2.EQS."")

 $ THEN
 $!
 $!  O.K., The User Didn't Specify A Compiler, Let's Try To
 $ THEN
 $!
 $!  O.K., The User Didn't Specify A Compiler, Let's Try To


@@ -648,7 +503,7 @@ $   THEN
 $!
 $!    Looks Like GNUC, Set To Use GNUC.
 $!
 $!
 $!    Looks Like GNUC, Set To Use GNUC.
 $!

-$     P3 = "GNUC"
+$     P2 = "GNUC"

 $!
 $!  End The GNU C Compiler Check.
 $!
 $!
 $!  End The GNU C Compiler Check.
 $!


@@ -661,7 +516,7 @@ $     THEN
 $!
 $!      Looks Like DECC, Set To Use DECC.
 $!
 $!
 $!      Looks Like DECC, Set To Use DECC.
 $!

-$       P3 = "DECC"
+$       P2 = "DECC"

 $!
 $!      Else...
 $!
 $!
 $!      Else...
 $!


@@ -669,7 +524,7 @@ $     ELSE
 $!
 $!      Looks Like VAXC, Set To Use VAXC.
 $!
 $!
 $!      Looks Like VAXC, Set To Use VAXC.
 $!

-$       P3 = "VAXC"
+$       P2 = "VAXC"

 $!
 $!    End The VAXC Compiler Check.
 $!
 $!
 $!    End The VAXC Compiler Check.
 $!


@@ -683,9 +538,9 @@ $!  End The Compiler Check.
 $!
 $ ENDIF
 $!
 $!
 $ ENDIF
 $!

-$! Check To See If We Have A Option For P4.
+$! Check To See If We Have A Option For P3.

 $!
 $!

-$ IF (P4.EQS."")
+$ IF (P3.EQS."")

 $ THEN
 $!
 $!  Find out what socket library we have available
 $ THEN
 $!
 $!  Find out what socket library we have available


@@ -695,7 +550,7 @@ $   THEN
 $!
 $!    We have SOCKETSHR, and it is my opinion that it's the best to use.
 $!
 $!
 $!    We have SOCKETSHR, and it is my opinion that it's the best to use.
 $!

-$     P4 = "SOCKETSHR"
+$     P3 = "SOCKETSHR"

 $!
 $!    Tell the user
 $!
 $!
 $!    Tell the user
 $!


@@ -715,7 +570,7 @@ $     THEN
 $!
 $!     Last resort: a UCX or UCX-compatible library
 $!
 $!
 $!     Last resort: a UCX or UCX-compatible library
 $!

-$      P4 = "UCX"
+$      P3 = "UCX"

 $!
 $!      Tell the user
 $!
 $!
 $!      Tell the user
 $!


@@ -729,46 +584,22 @@ $ ENDIF
 $!
 $! Set Up Initial CC Definitions, Possibly With User Ones
 $!
 $!
 $! Set Up Initial CC Definitions, Possibly With User Ones
 $!

-$ CCDEFS = "VMS=1,TCPIP_TYPE_''P4'"
-$ IF F$TRNLNM("OPENSSL_NO_ASM") THEN CCDEFS = CCDEFS + ",NO_ASM"
-$ IF F$TRNLNM("OPENSSL_NO_RSA") THEN CCDEFS = CCDEFS + ",NO_RSA"
-$ IF F$TRNLNM("OPENSSL_NO_DSA") THEN CCDEFS = CCDEFS + ",NO_DSA"
-$ IF F$TRNLNM("OPENSSL_NO_DH") THEN CCDEFS = CCDEFS + ",NO_DH"
-$ IF F$TRNLNM("OPENSSL_NO_MD2") THEN CCDEFS = CCDEFS + ",NO_MD2"
-$ IF F$TRNLNM("OPENSSL_NO_MD5") THEN CCDEFS = CCDEFS + ",NO_MD5"
-$ IF F$TRNLNM("OPENSSL_NO_RIPEMD") THEN CCDEFS = CCDEFS + ",NO_RIPEMD"
-$ IF F$TRNLNM("OPENSSL_NO_SHA") THEN CCDEFS = CCDEFS + ",NO_SHA"
-$ IF F$TRNLNM("OPENSSL_NO_SHA0") THEN CCDEFS = CCDEFS + ",NO_SHA0"
-$ IF F$TRNLNM("OPENSSL_NO_SHA1") THEN CCDEFS = CCDEFS + ",NO_SHA1"
-$ IF F$TRNLNM("OPENSSL_NO_DES")
-$ THEN
-$   CCDEFS = CCDEFS + ",NO_DES,NO_MDC2"
-$ ELSE
-$   IF F$TRNLNM("OPENSSL_NO_MDC2") THEN CCDEFS = CCDEFS + ",NO_MDC2"
-$ ENDIF
-$ IF F$TRNLNM("OPENSSL_NO_RC2") THEN CCDEFS = CCDEFS + ",NO_RC2"
-$ IF F$TRNLNM("OPENSSL_NO_RC4") THEN CCDEFS = CCDEFS + ",NO_RC4"
-$ IF F$TRNLNM("OPENSSL_NO_RC5") THEN CCDEFS = CCDEFS + ",NO_RC5"
-$ IF F$TRNLNM("OPENSSL_NO_IDEA") THEN CCDEFS = CCDEFS + ",NO_IDEA"
-$ IF F$TRNLNM("OPENSSL_NO_BF") THEN CCDEFS = CCDEFS + ",NO_BF"
-$ IF F$TRNLNM("OPENSSL_NO_CAST") THEN CCDEFS = CCDEFS + ",NO_CAST"
-$ IF F$TRNLNM("OPENSSL_NO_HMAC") THEN CCDEFS = CCDEFS + ",NO_HMAC"
-$ IF F$TRNLNM("OPENSSL_NO_SSL2") THEN CCDEFS = CCDEFS + ",NO_SSL2"
+$ 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
 $ 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"
+$ 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.
 $!
 $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
        CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS
 $!
 $!  Check To See If The User Entered A Valid Paramter.
 $!

-$ IF (P3.EQS."VAXC").OR.(P3.EQS."DECC").OR.(P3.EQS."GNUC")
+$ IF (P2.EQS."VAXC").OR.(P2.EQS."DECC").OR.(P2.EQS."GNUC")

 $ THEN
 $!
 $!  Check To See If The User Wanted DECC.
 $!
 $ THEN
 $!
 $!  Check To See If The User Wanted DECC.
 $!

-$   IF (P3.EQS."DECC")
+$   IF (P2.EQS."DECC")

 $   THEN
 $!
 $!    Looks Like DECC, Set To Use DECC.
 $   THEN
 $!
 $!    Looks Like DECC, Set To Use DECC.


@@ -785,7 +616,8 @@ $     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" + -
 $     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" + CCEXTRAFLAGS
+           "/NOLIST/PREFIX=ALL" + -
+          "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS

 $!
 $!    Define The Linker Options File Name.
 $!
 $!
 $!    Define The Linker Options File Name.
 $!


@@ -797,7 +629,7 @@ $   ENDIF
 $!
 $!  Check To See If We Are To Use VAXC.
 $!
 $!
 $!  Check To See If We Are To Use VAXC.
 $!

-$   IF (P3.EQS."VAXC")
+$   IF (P2.EQS."VAXC")

 $   THEN
 $!
 $!    Looks Like VAXC, Set To Use VAXC.
 $   THEN
 $!
 $!    Looks Like VAXC, Set To Use VAXC.


@@ -817,7 +649,8 @@ $   WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
 $      EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
 $      EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"

-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS
+$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
+          "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS

 $     CCDEFS = CCDEFS + ",""VAXC"""
 $!
 $!    Define <sys> As SYS$COMMON:[SYSLIB]
 $     CCDEFS = CCDEFS + ",""VAXC"""
 $!
 $!    Define <sys> As SYS$COMMON:[SYSLIB]


@@ -834,7 +667,7 @@ $   ENDIF
 $!
 $!  Check To See If We Are To Use GNU C.
 $!
 $!
 $!  Check To See If We Are To Use GNU C.
 $!

-$   IF (P3.EQS."GNUC")
+$   IF (P2.EQS."GNUC")

 $   THEN
 $!
 $!    Looks Like GNUC, Set To Use GNUC.
 $   THEN
 $!
 $!    Looks Like GNUC, Set To Use GNUC.


@@ -847,7 +680,8 @@ $     WRITE SYS$OUTPUT "Using GNU 'C' Compiler."
 $!
 $!    Use GNU C...
 $!
 $!
 $!    Use GNU C...
 $!

-$     CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS
+$     CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
+          "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS

 $!
 $!    Define The Linker Options File Name.
 $!
 $!
 $!    Define The Linker Options File Name.
 $!


@@ -861,31 +695,6 @@ $!  Set up default defines
 $!
 $   CCDEFS = """FLAT_INC=1""," + CCDEFS
 $!
 $!
 $   CCDEFS = """FLAT_INC=1""," + CCDEFS
 $!

-$!  Check To See If We Are To Compile With RSAREF Routines.
-$!
-$   IF (RSAREF.EQS."TRUE")
-$   THEN
-$!
-$!    Compile With RSAREF.
-$!
-$     CCDEFS = CCDEFS + ",""RSAref=1"""
-$!
-$!    Tell The User This.
-$!
-$     WRITE SYS$OUTPUT "Compiling With RSAREF Routines."
-$!
-$!    Else, We Don't Care.  Compile Without The RSAREF Library.
-$!
-$   ELSE
-$!
-$!    Tell The User We Are Compile Without The RSAREF Routines.
-$!
-$     WRITE SYS$OUTPUT "Compiling Without The RSAREF Routines.
-$!
-$!  End The RSAREF Check.
-$!
-$   ENDIF
-$!

 $!  Finish up the definition of CC.
 $!
 $   IF COMPILER .EQS. "DECC"
 $!  Finish up the definition of CC.
 $!
 $   IF COMPILER .EQS. "DECC"


@@ -906,7 +715,7 @@ $   CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
 $!
 $!  Show user the result
 $!
 $!
 $!  Show user the result
 $!

-$   WRITE SYS$OUTPUT "Main Compiling Command: ",CC
+$   WRITE/SYMBOL SYS$OUTPUT "Main Compiling Command: ",CC

 $!
 $!  Else The User Entered An Invalid Arguement.
 $!
 $!
 $!  Else The User Entered An Invalid Arguement.
 $!


@@ -915,7 +724,7 @@ $!
 $!  Tell The User We Don't Know What They Want.
 $!
 $   WRITE SYS$OUTPUT ""
 $!  Tell The User We Don't Know What They Want.
 $!
 $   WRITE SYS$OUTPUT ""

-$   WRITE SYS$OUTPUT "The Option ",P3," Is Invalid.  The Valid Options Are:"
+$   WRITE SYS$OUTPUT "The Option ",P2," Is Invalid.  The Valid Options Are:"

 $   WRITE SYS$OUTPUT ""
 $   WRITE SYS$OUTPUT "    VAXC  :  To Compile With VAX C."
 $   WRITE SYS$OUTPUT "    DECC  :  To Compile With DEC C."
 $   WRITE SYS$OUTPUT ""
 $   WRITE SYS$OUTPUT "    VAXC  :  To Compile With VAX C."
 $   WRITE SYS$OUTPUT "    DECC  :  To Compile With DEC C."


@@ -929,17 +738,18 @@ $ ENDIF
 $!
 $! Time to check the contents, and to make sure we get the correct library.
 $!
 $!
 $! Time to check the contents, and to make sure we get the correct library.
 $!

-$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX"
+$ IF P3.EQS."SOCKETSHR" .OR. P3.EQS."MULTINET" .OR. P3.EQS."UCX" -
+     .OR. P3.EQS."TCPIP" .OR. P3.EQS."NONE"

 $ THEN
 $!
 $!  Check to see if SOCKETSHR was chosen
 $!
 $ THEN
 $!
 $!  Check to see if SOCKETSHR was chosen
 $!

-$   IF P4.EQS."SOCKETSHR"
+$   IF P3.EQS."SOCKETSHR"

 $   THEN
 $!
 $!    Set the library to use SOCKETSHR
 $!
 $   THEN
 $!
 $!    Set the library to use SOCKETSHR
 $!

-$     TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT"
+$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"

 $!
 $!    Done with SOCKETSHR
 $!
 $!
 $!    Done with SOCKETSHR
 $!


@@ -947,12 +757,12 @@ $   ENDIF
 $!
 $!  Check to see if MULTINET was chosen
 $!
 $!
 $!  Check to see if MULTINET was chosen
 $!

-$   IF P4.EQS."MULTINET"
+$   IF P3.EQS."MULTINET"

 $   THEN
 $!
 $!    Set the library to use UXC emulation.
 $!
 $   THEN
 $!
 $!    Set the library to use UXC emulation.
 $!

-$     P4 = "UCX"
+$     P3 = "UCX"

 $!
 $!    Done with MULTINET
 $!
 $!
 $!    Done with MULTINET
 $!


@@ -960,24 +770,50 @@ $   ENDIF
 $!
 $!  Check to see if UCX was chosen
 $!
 $!
 $!  Check to see if UCX was chosen
 $!

-$   IF P4.EQS."UCX"
+$   IF P3.EQS."UCX"

 $   THEN
 $!
 $!    Set the library to use UCX.
 $!
 $   THEN
 $!
 $!    Set the library to use UCX.
 $!

-$     TCPIP_LIB = "[-.VMS]UCX_SHR_DECC.OPT/OPT"
+$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"

 $     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
 $     THEN
 $     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
 $     THEN

-$       TCPIP_LIB = "[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
+$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"

 $     ELSE
 $       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
 $     ELSE
 $       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -

-         TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT"
+         TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"

 $     ENDIF
 $!
 $!    Done with UCX
 $!
 $   ENDIF
 $!
 $     ENDIF
 $!
 $!    Done with UCX
 $!
 $   ENDIF
 $!

+$!  Check to see if TCPIP was chosen
+$!
+$   IF P3.EQS."TCPIP"
+$   THEN
+$!
+$!    Set the library to use TCPIP (post UCX).
+$!
+$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
+$!
+$!    Done with TCPIP
+$!
+$   ENDIF
+$!
+$!  Check to see if NONE was chosen
+$!
+$   IF P3.EQS."NONE"
+$   THEN
+$!
+$!    Do not use a TCPIP library.
+$!
+$     TCPIP_LIB = ""
+$!
+$!    Done with NONE
+$!
+$   ENDIF
+$!

 $!  Print info
 $!
 $   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
 $!  Print info
 $!
 $   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB


@@ -989,10 +825,11 @@ $!
 $!  Tell The User We Don't Know What They Want.
 $!
 $   WRITE SYS$OUTPUT ""
 $!  Tell The User We Don't Know What They Want.
 $!
 $   WRITE SYS$OUTPUT ""

-$   WRITE SYS$OUTPUT "The Option ",P4," Is Invalid.  The Valid Options Are:"
+$   WRITE SYS$OUTPUT "The Option ",P3," Is Invalid.  The Valid Options Are:"

 $   WRITE SYS$OUTPUT ""
 $   WRITE SYS$OUTPUT "    SOCKETSHR  :  To link with SOCKETSHR TCP/IP library."
 $   WRITE SYS$OUTPUT "    UCX        :  To link with UCX TCP/IP library."
 $   WRITE SYS$OUTPUT ""
 $   WRITE SYS$OUTPUT "    SOCKETSHR  :  To link with SOCKETSHR TCP/IP library."
 $   WRITE SYS$OUTPUT "    UCX        :  To link with UCX TCP/IP library."

+$   WRITE SYS$OUTPUT "    TCPIP      :  To link with TCPIP (post UCX) TCP/IP library."

 $   WRITE SYS$OUTPUT ""
 $!
 $!  Time To EXIT.
 $   WRITE SYS$OUTPUT ""
 $!
 $!  Time To EXIT.


@@ -1009,9 +846,9 @@ $! Written By:  Richard Levitte
 $!              richard@levitte.org
 $!
 $!
 $!              richard@levitte.org
 $!
 $!

-$! Check To See If We Have A Option For P5.
+$! Check To See If We Have A Option For P4.

 $!
 $!

-$ IF (P5.EQS."")
+$ IF (P4.EQS."")

 $ THEN
 $!
 $!  Get The Version Of VMS We Are Using.
 $ THEN
 $!
 $!  Get The Version Of VMS We Are Using.


@@ -1033,7 +870,7 @@ $!  End The VMS Version Check.
 $!
 $   ENDIF
 $!
 $!
 $   ENDIF
 $!

-$! End The P5 Check.
+$! End The P4 Check.

 $!
 $ ENDIF
 $!
 $!
 $ ENDIF
 $!


@@ -1050,6 +887,7 @@ $!
 $! Save directory information
 $!
 $ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"
 $! Save directory information
 $!
 $ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"

+$ __HERE = F$EDIT(__HERE,"UPCASE")

 $ __TOP = __HERE - "TEST]"
 $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!
 $ __TOP = __HERE - "TEST]"
 $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!