aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/makeapps.com292
-rw-r--r--crypto/crypto-lib.com340
-rwxr-xr-xmakevms.com124
-rw-r--r--ssl/ssl-lib.com280
-rw-r--r--test/maketests.com262
5 files changed, 213 insertions, 1085 deletions
diff --git a/apps/makeapps.com b/apps/makeapps.com
index cfb9591512..140816a7c9 100644
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -15,22 +15,10 @@ $!
$! It was written so it would try to determine what "C" compiler to
$! use or you can specify which "C" compiler to use.
$!
-$! 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 as P2 to compile with or without debugger
+$! Specify DEBUG or NODEBUG as P1 to compile with or without debugger
$! 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.
@@ -39,16 +27,16 @@ $!
$! 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
$! TCPIP for TCPIP (post UCX)
$!
-$! 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)
$!
-$! P6, if defined, sets a choice of programs to compile.
+$! P5, if defined, sets a choice of programs to compile.
$!
$!
$! Define A TCP/IP Library That We Will Need To Link To.
@@ -101,10 +89,6 @@ $! Define The CRYPTO Library.
$!
$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
$!
-$! Define The RSAREF Library.
-$!
-$ RSAREF_LIB := SYS$DISK:[-.'ARCH'.EXE.RSAREF]LIBRSAGLUE.OLB
-$!
$! Define The SSL Library.
$!
$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
@@ -293,73 +277,31 @@ $ WRITE SYS$OUTPUT FILE_NAME," needs a TCP/IP library. Can't link. Skipping.
$ GOTO NEXT_FILE
$ ENDIF
$!
-$! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
+$! Link The Program.
+$! Check To See If We Are To Link With A Specific TCP/IP Library.
$!
-$ IF (RSAREF.EQS."TRUE")
+$ IF (TCPIP_LIB.NES."")
$ 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''EXTRA_OBJ', -
- 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
- 'TCPIP_LIB','OPT_FILE'/OPTION
+$! Don't Link With The RSAREF Routines And TCP/IP Library.
$!
-$! Else...
-$!
-$ ELSE
-$!
-$! Link With The RSAREF Library And NO TCP/IP Library.
-$!
-$ LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
- 'OBJECT_FILE''EXTRA_OBJ', -
- 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
- 'OPT_FILE'/OPTION
-$!
-$! End The TCP/IP Library Check.
-$!
-$ ENDIF
+$ LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
+ 'OBJECT_FILE''EXTRA_OBJ', -
+ 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
+ 'TCPIP_LIB','OPT_FILE'/OPTION
$!
$! Else...
$!
$ ELSE
$!
-$! Don't Link With The RSAREF Routines.
-$!
+$! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
$!
-$! Check To See If We Are To Link With A Specific TCP/IP Library.
+$ LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
+ 'OBJECT_FILE''EXTRA_OBJ', -
+ 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
+ 'OPT_FILE'/OPTION
$!
-$ IF (TCPIP_LIB.NES."")
-$ THEN
-$!
-$! Don't Link With The RSAREF Routines And TCP/IP Library.
-$!
-$ LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
- 'OBJECT_FILE''EXTRA_OBJ', -
- 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
- 'TCPIP_LIB','OPT_FILE'/OPTION
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
-$!
-$ LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
- 'OBJECT_FILE''EXTRA_OBJ', -
- '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
$!
@@ -526,32 +468,6 @@ $! End The Crypto Library Check.
$!
$ 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."")
@@ -582,87 +498,10 @@ $ CHECK_OPTIONS:
$!
$! Check To See If P1 Is Blank.
$!
-$ P1 = "NORSAREF"
-$ IF (P1.EQS."NORSAREF")
+$ IF (P1.EQS."NODEBUG")
$ THEN
$!
-$! P1 Is NORSAREF, So Compile With The Regular RSA Libraries.
-$!
-$ RSAREF = "FALSE"
-$!
-$! Else...
-$!
-$ 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...
-$!
-$ ELSE
-$!
-$! Compile Using The RSAREF Library.
-$!
-$ RSAREF = "TRUE"
-$!
-$! End The RSAREF Soure Directory Check.
-$!
-$ ENDIF
-$!
-$! Else...
-$!
-$ 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 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"
@@ -677,7 +516,7 @@ $ ELSE
$!
$! Check To See If We Are To Compile With Debugger Information.
$!
-$ IF (P2.EQS."DEBUG")
+$ IF (P1.EQS."DEBUG")
$ THEN
$!
$! Compile With Debugger Information.
@@ -693,7 +532,7 @@ $!
$! 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."
@@ -707,13 +546,13 @@ $! End The Valid Arguement Check.
$!
$ ENDIF
$!
-$! End The P2 Check.
+$! End The P1 Check.
$!
$ 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
@@ -726,7 +565,7 @@ $ THEN
$!
$! Looks Like GNUC, Set To Use GNUC.
$!
-$ P3 = "GNUC"
+$ P2 = "GNUC"
$!
$! Else...
$!
@@ -739,7 +578,7 @@ $ THEN
$!
$! Looks Like DECC, Set To Use DECC.
$!
-$ P3 = "DECC"
+$ P2 = "DECC"
$!
$! Else...
$!
@@ -747,7 +586,7 @@ $ ELSE
$!
$! Looks Like VAXC, Set To Use VAXC.
$!
-$ P3 = "VAXC"
+$ P2 = "VAXC"
$!
$! End The VAXC Compiler Check.
$!
@@ -761,9 +600,9 @@ $! End The Compiler Check.
$!
$ 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
@@ -773,7 +612,7 @@ $ THEN
$!
$! We have SOCKETSHR, and it is my opinion that it's the best to use.
$!
-$ P4 = "SOCKETSHR"
+$ P3 = "SOCKETSHR"
$!
$! Tell the user
$!
@@ -793,7 +632,7 @@ $ THEN
$!
$! Last resort: a UCX or UCX-compatible library
$!
-$ P4 = "UCX"
+$ P3 = "UCX"
$!
$! Tell the user
$!
@@ -817,12 +656,12 @@ $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
$!
$! 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.
$!
-$ IF (P3.EQS."DECC")
+$ IF (P2.EQS."DECC")
$ THEN
$!
$! Looks Like DECC, Set To Use DECC.
@@ -852,7 +691,7 @@ $ ENDIF
$!
$! 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.
@@ -889,7 +728,7 @@ $ ENDIF
$!
$! 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.
@@ -918,31 +757,6 @@ $! Set up default defines
$!
$ 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
-$!
$! Else The User Entered An Invalid Arguement.
$!
$ ELSE
@@ -950,7 +764,7 @@ $!
$! 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."
@@ -964,13 +778,13 @@ $ ENDIF
$!
$! 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" -
- .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
+$ 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
$!
-$ IF P4.EQS."SOCKETSHR"
+$ IF P3.EQS."SOCKETSHR"
$ THEN
$!
$! Set the library to use SOCKETSHR
@@ -983,12 +797,12 @@ $ ENDIF
$!
$! Check to see if MULTINET was chosen
$!
-$ IF P4.EQS."MULTINET"
+$ IF P3.EQS."MULTINET"
$ THEN
$!
$! Set the library to use UCX emulation.
$!
-$ P4 = "UCX"
+$ P3 = "UCX"
$!
$! Done with MULTINET
$!
@@ -996,7 +810,7 @@ $ ENDIF
$!
$! Check to see if UCX was chosen
$!
-$ IF P4.EQS."UCX"
+$ IF P3.EQS."UCX"
$ THEN
$!
$! Set the library to use UCX.
@@ -1016,7 +830,7 @@ $ ENDIF
$!
$! Check to see if TCPIP (post UCX) was chosen
$!
-$ IF P4.EQS."TCPIP"
+$ IF P3.EQS."TCPIP"
$ THEN
$!
$! Set the library to use TCPIP.
@@ -1029,7 +843,7 @@ $ ENDIF
$!
$! Check to see if NONE was chosen
$!
-$ IF P4.EQS."NONE"
+$ IF P3.EQS."NONE"
$ THEN
$!
$! Do not use TCPIP.
@@ -1042,7 +856,7 @@ $ ENDIF
$!
$! Add TCP/IP type to CC definitions.
$!
-$ CCDEFS = CCDEFS + ",TCPIP_TYPE_''P4'"
+$ CCDEFS = CCDEFS + ",TCPIP_TYPE_''P3'"
$!
$! Print info
$!
@@ -1055,7 +869,7 @@ $!
$! 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."
@@ -1094,9 +908,9 @@ $! Written By: Richard Levitte
$! 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.
@@ -1118,15 +932,15 @@ $! End The VMS Version Check.
$!
$ ENDIF
$!
-$! End The P5 Check.
+$! End The P4 Check.
$!
$ ENDIF
$!
$! Check if the user wanted to compile just a subset of all the programs.
$!
-$ IF P6 .NES. ""
+$ IF P5 .NES. ""
$ THEN
-$ PROGRAMS = P6
+$ PROGRAMS = P5
$ ENDIF
$!
$! Time To RETURN...
diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index b9a0916183..4a2b4c2277 100644
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -21,22 +21,10 @@ $! LIBRARY To just compile the [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library.
$! APPS To just compile the [.xxx.EXE.CRYPTO]*.EXE
$! ALL To do both LIBRARY and APPS
$!
-$! Specify RSAREF as P2 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 as P3 to compile with or without debugger
+$! Specify DEBUG or NODEBUG as P2 to compile with or without debugger
$! information.
$!
-$! Specify which compiler at P4 to try to compile under.
+$! Specify which compiler at P3 to try to compile under.
$!
$! VAXC For VAX C.
$! DECC For DEC C.
@@ -45,16 +33,16 @@ $!
$! If you don't speficy a compiler, it will try to determine which
$! "C" compiler to use.
$!
-$! P5, if defined, sets a TCP/IP library to use, through one of the following
+$! P4, if defined, sets a TCP/IP library to use, through one of the following
$! keywords:
$!
$! UCX for UCX
$! TCPIP for TCPIP (post UCX)
$! SOCKETSHR for SOCKETSHR+NETLIB
$!
-$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
+$! P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
$!
-$! P7, if defined, sets a choice of crypto methods to compile.
+$! P6, if defined, sets a choice of crypto methods to compile.
$! WARNING: this should only be done to recompile some part of an already
$! fully compiled library.
$!
@@ -93,7 +81,6 @@ $ ENCRYPT_TYPES = "Basic,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ -
"BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,"+ -
"EVP,EVP_2,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
"CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5"
-$ ENCRYPT_PROGRAMS = "DES,PKCS7"
$!
$! Check To Make Sure We Have Valid Command Line Parameters.
$!
@@ -149,10 +136,6 @@ $! Define The CRYPTO-LIB We Are To Use.
$!
$ CRYPTO_LIB := 'EXE_DIR'LIBCRYPTO.OLB
$!
-$! Define The RSAREF-LIB We Are To Use.
-$!
-$ RSAREF_LIB := SYS$DISK:[-.'ARCH'.EXE.RSAREF]LIBRSAGLUE.OLB
-$!
$! Check To See If We Already Have A "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" Library...
$!
$ IF (F$SEARCH(LIB_NAME).EQS."")
@@ -288,86 +271,6 @@ $ COMPILEWITH_CC4 = ",a_utctm,bss_log,o_time,"
$ COMPILEWITH_CC5 = ",md2_dgst,md4_dgst,md5_dgst,mdc2dgst," + -
"sha_dgst,sha1dgst,rmd_dgst,bf_enc,"
$!
-$! Check To See If We Are Going To Use RSAREF.
-$!
-$ IF (RSAREF.EQS."TRUE" .AND. ENCRYPT_TYPES - "RSA".NES.ENCRYPT_TYPES -
- .AND. (BUILDALL .EQS. "TRUE" .OR. BUILDALL .EQS. "LIBRARY"))
-$ THEN
-$!
-$! Check To See If The File [-.RSAREF]RSAREF.C Is Actually There.
-$!
-$ IF (F$SEARCH("SYS$DISK:[-.RSAREF]RSAREF.C").EQS."")
-$ THEN
-$!
-$! Tell The User That The File Doesn't Exist.
-$!
-$ WRITE SYS$OUTPUT ""
-$ WRITE SYS$OUTPUT "The File [-.RSAREF]RSAREF.C Doesn't Exist."
-$ WRITE SYS$OUTPUT ""
-$!
-$! Exit The Build.
-$!
-$ GOTO EXIT
-$!
-$! End The [-.RSAREF]RSAREF.C Check.
-$!
-$ ENDIF
-$!
-$! Tell The User We Are Compiling The [-.RSAREF]RSAREF File.
-$!
-$ WRITE SYS$OUTPUT "Compiling The [-.RSAREF]RSAREF File."
-$!
-$! Compile [-.RSAREF]RSAREF.C
-$!
-$ CC/OBJECT='OBJ_DIR'RSAREF.OBJ SYS$DISK:[-.RSAREF]RSAREF.C
-$!
-$! Add It To The Library.
-$!
-$ LIBRARY/REPLACE 'LIB_NAME' 'OBJ_DIR'RSAREF.OBJ
-$!
-$! Delete The Object File.
-$!
-$ DELETE 'OBJ_DIR'RSAREF.OBJ;*
-$!
-$! Check To See If The File [-.RSAREF]RSAR_ERR.C Is Actually There.
-$!
-$ IF (F$SEARCH("SYS$DISK:[-.RSAREF]RSAR_ERR.C").EQS."")
-$ THEN
-$!
-$! Tell The User That The File Doesn't Exist.
-$!
-$ WRITE SYS$OUTPUT ""
-$ WRITE SYS$OUTPUT "The File [-.RSAREF]RSAR_ERR.C Doesn't Exist."
-$ WRITE SYS$OUTPUT ""
-$!
-$! Exit The Build.
-$!
-$ GOTO EXIT
-$!
-$! End The [-.RSAREF]RSAR_ERR.C File Check.
-$!
-$ ENDIF
-$!
-$! Tell The User We Are Compiling The [-.RSAREF]RSAR_ERR File.
-$!
-$ WRITE SYS$OUTPUT "Compiling The [-.RSAREF]RSAR_ERR File."
-$!
-$! Compile [-.RSAREF]RSAR_ERR.C
-$!
-$ CC/OBJECT='OBJ_DIR'RSAR_ERR.OBJ SYS$DISK:[-.RSAREF]RSAR_ERR.C
-$!
-$! Add It To The Library.
-$!
-$ LIBRARY/REPLACE 'LIB_NAME' 'OBJ_DIR'RSAR_ERR.OBJ
-$!
-$! Delete The Object File.
-$!
-$ DELETE 'OBJ_DIR'RSAR_ERR.OBJ;*
-$!
-$! End The RSAREF Check.
-$!
-$ ENDIF
-$!
$! Figure Out What Other Modules We Are To Build.
$!
$ BUILD_SET:
@@ -640,74 +543,34 @@ $! Tell the user what happens
$!
$ WRITE SYS$OUTPUT " ",APPLICATION,".exe"
$!
-$! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
+$! Link The Program.
$!
$ ON ERROR THEN GOTO NEXT_APPLICATION
-$ IF (RSAREF.EQS."TRUE")
-$ THEN
$!
-$! Check To See If We Are To Link With A Specific TCP/IP Library.
+$! 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_DIR''APPLICATION'.EXE -
- 'OBJ_DIR''APPLICATION_OBJECTS', -
- 'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
- 'TCPIP_LIB','OPT_FILE'/OPTION
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$! Link With The RSAREF Library And NO TCP/IP Library.
+$ IF (TCPIP_LIB.NES."")
+$ THEN
$!
-$ LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
- 'OBJ_DIR''APPLICATION_OBJECTS', -
- 'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
- 'OPT_FILE'/OPTION
+$! Link With A TCP/IP Library.
$!
-$! End The TCP/IP Library Check.
+$ LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
+ 'OBJ_DIR''APPLICATION_OBJECTS', -
+ 'CRYPTO_LIB'/LIBRARY, -
+ 'TCPIP_LIB','OPT_FILE'/OPTION
$!
-$ ENDIF
-$!
-$! Else...
+$! 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.
-$!
-$ LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
- 'OBJ_DIR''APPLICATION_OBJECTS', -
- 'CRYPTO_LIB'/LIBRARY, -
- 'TCPIP_LIB','OPT_FILE'/OPTION
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
-$!
-$ LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
- 'OBJ_DIR''APPLICATION_OBJECTS',-
- 'CRYPTO_LIB'/LIBRARY, -
- 'OPT_FILE'/OPTION
+$! Don't Link With A TCP/IP Library.
$!
-$! End The TCP/IP Library Check.
+$ LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
+ 'OBJ_DIR''APPLICATION_OBJECTS',-
+ 'CRYPTO_LIB'/LIBRARY, -
+ 'OPT_FILE'/OPTION
$!
-$ ENDIF
-$!
-$! End The RSAREF Link Check.
+$! End The TCP/IP Library Check.
$!
$ ENDIF
$ GOTO NEXT_APPLICATION
@@ -913,75 +776,10 @@ $ ENDIF
$!
$! Check To See If P2 Is Blank.
$!
-$ P2 = "NORSAREF"
-$ IF (P2.EQS."NORSAREF")
+$ IF (P2.EQS."NODEBUG")
$ THEN
$!
-$! P2 Is NORSAREF, So Compile With The Regular RSA Libraries.
-$!
-$ RSAREF = "FALSE"
-$ ELSE
-$!
-$! Check To See If We Are To Use The RSAREF Library.
-$!
-$ IF (P2.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 doesn'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 ",P2," 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 P2 Check.
-$!
-$ ENDIF
-$!
-$! Check To See If P3 Is Blank.
-$!
-$ IF (P3.EQS."NODEBUG")
-$ THEN
-$!
-$! P3 Is NODEBUG, So Compile Without The Debugger Information.
+$! P2 Is NODEBUG, So Compile Without The Debugger Information.
$!
$ DEBUGGER = "NODEBUG"
$ TRACEBACK = "NOTRACEBACK"
@@ -994,7 +792,7 @@ $ ELSE
$!
$! Check To See If We Are To Compile With Debugger Information.
$!
-$ IF (P3.EQS."DEBUG")
+$ IF (P2.EQS."DEBUG")
$ THEN
$!
$! Compile With Debugger Information.
@@ -1011,7 +809,7 @@ $!
$! They Entered An Invalid Option..
$!
$ 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 " DEBUG : Compile With The Debugger Information."
$ WRITE SYS$OUTPUT " NODEBUG : Compile Without The Debugger Information."
@@ -1025,7 +823,7 @@ $! End The Valid Arguement Check.
$!
$ ENDIF
$!
-$! End The P3 Check.
+$! End The P2 Check.
$!
$ ENDIF
$!
@@ -1035,9 +833,9 @@ $! Written By: Richard Levitte
$! richard@levitte.org
$!
$!
-$! Check To See If We Have A Option For P6.
+$! Check To See If We Have A Option For P5.
$!
-$ IF (P6.EQS."")
+$ IF (P5.EQS."")
$ THEN
$!
$! Get The Version Of VMS We Are Using.
@@ -1059,13 +857,13 @@ $! End The VMS Version Check.
$!
$ ENDIF
$!
-$! End The P6 Check.
+$! End The P5 Check.
$!
$ ENDIF
$!
-$! Check To See If P4 Is Blank.
+$! Check To See If P3 Is Blank.
$!
-$ IF (P4.EQS."")
+$ IF (P3.EQS."")
$ THEN
$!
$! O.K., The User Didn't Specify A Compiler, Let's Try To
@@ -1078,7 +876,7 @@ $ THEN
$!
$! Looks Like GNUC, Set To Use GNUC.
$!
-$ P4 = "GNUC"
+$ P3 = "GNUC"
$!
$! Else...
$!
@@ -1091,7 +889,7 @@ $ THEN
$!
$! Looks Like DECC, Set To Use DECC.
$!
-$ P4 = "DECC"
+$ P3 = "DECC"
$!
$! Else...
$!
@@ -1099,7 +897,7 @@ $ ELSE
$!
$! Looks Like VAXC, Set To Use VAXC.
$!
-$ P4 = "VAXC"
+$ P3 = "VAXC"
$!
$! End The VAXC Compiler Check.
$!
@@ -1113,9 +911,9 @@ $! End The Compiler Check.
$!
$ ENDIF
$!
-$! 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
$!
$! Find out what socket library we have available
@@ -1125,7 +923,7 @@ $ THEN
$!
$! We have SOCKETSHR, and it is my opinion that it's the best to use.
$!
-$ P5 = "SOCKETSHR"
+$ P4 = "SOCKETSHR"
$!
$! Tell the user
$!
@@ -1145,7 +943,7 @@ $ THEN
$!
$! Last resort: a UCX or UCX-compatible library
$!
-$ P5 = "UCX"
+$ P4 = "UCX"
$!
$! Tell the user
$!
@@ -1159,7 +957,7 @@ $ ENDIF
$!
$! Set Up Initial CC Definitions, Possibly With User Ones
$!
-$ CCDEFS = "TCPIP_TYPE_''P5',DSO_VMS"
+$ CCDEFS = "TCPIP_TYPE_''P4',DSO_VMS"
$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
$ CCEXTRAFLAGS = ""
$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
@@ -1169,12 +967,12 @@ $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
$!
$! Check To See If The User Entered A Valid Paramter.
$!
-$ IF (P4.EQS."VAXC").OR.(P4.EQS."DECC").OR.(P4.EQS."GNUC")
+$ IF (P3.EQS."VAXC").OR.(P3.EQS."DECC").OR.(P3.EQS."GNUC")
$ THEN
$!
$! Check To See If The User Wanted DECC.
$!
-$ IF (P4.EQS."DECC")
+$ IF (P3.EQS."DECC")
$ THEN
$!
$! Looks Like DECC, Set To Use DECC.
@@ -1205,7 +1003,7 @@ $ ENDIF
$!
$! Check To See If We Are To Use VAXC.
$!
-$ IF (P4.EQS."VAXC")
+$ IF (P3.EQS."VAXC")
$ THEN
$!
$! Looks Like VAXC, Set To Use VAXC.
@@ -1244,7 +1042,7 @@ $ ENDIF
$!
$! Check To See If We Are To Use GNU C.
$!
-$ IF (P4.EQS."GNUC")
+$ IF (P3.EQS."GNUC")
$ THEN
$!
$! Looks Like GNUC, Set To Use GNUC.
@@ -1273,31 +1071,6 @@ $! Set up default defines
$!
$ 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"
@@ -1316,7 +1089,7 @@ $ CC4DISABLEWARNINGS = ""
$ ENDIF
$ CC3 = CC + "/DEFINE=(" + CCDEFS + ISSEVEN + ")" + CCDISABLEWARNINGS
$ CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
-$ IF ARCH .EQS. "VAX" .AND. COMPILER .EQS. "DECC" .AND. P3 .NES. "DEBUG"
+$ IF ARCH .EQS. "VAX" .AND. COMPILER .EQS. "DECC" .AND. P2 .NES. "DEBUG"
$ THEN
$ CC5 = CC + "/OPTIMIZE=NODISJOINT"
$ ELSE
@@ -1335,7 +1108,7 @@ $!
$! 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 " VAXC : To Compile With VAX C."
$ WRITE SYS$OUTPUT " DECC : To Compile With DEC C."
@@ -1361,13 +1134,13 @@ $ WRITE/SYMBOL SYS$OUTPUT "Main MACRO Compiling Command: ",MACRO
$!
$! Time to check the contents, and to make sure we get the correct library.
$!
-$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" -
- .OR. P5.EQS."TCPIP" .OR. P5.EQS."NONE"
+$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" -
+ .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
$ THEN
$!
$! Check to see if SOCKETSHR was chosen
$!
-$ IF P5.EQS."SOCKETSHR"
+$ IF P4.EQS."SOCKETSHR"
$ THEN
$!
$! Set the library to use SOCKETSHR
@@ -1380,12 +1153,12 @@ $ ENDIF
$!
$! Check to see if MULTINET was chosen
$!
-$ IF P5.EQS."MULTINET"
+$ IF P4.EQS."MULTINET"
$ THEN
$!
$! Set the library to use UCX emulation.
$!
-$ P5 = "UCX"
+$ P4 = "UCX"
$!
$! Done with MULTINET
$!
@@ -1393,7 +1166,7 @@ $ ENDIF
$!
$! Check to see if UCX was chosen
$!
-$ IF P5.EQS."UCX"
+$ IF P4.EQS."UCX"
$ THEN
$!
$! Set the library to use UCX.
@@ -1413,7 +1186,7 @@ $ ENDIF
$!
$! Check to see if TCPIP was chosen
$!
-$ IF P5.EQS."TCPIP"
+$ IF P4.EQS."TCPIP"
$ THEN
$!
$! Set the library to use TCPIP (post UCX).
@@ -1426,7 +1199,7 @@ $ ENDIF
$!
$! Check to see if NONE was chosen
$!
-$ IF P5.EQS."NONE"
+$ IF P4.EQS."NONE"
$ THEN
$!
$! Do not use a TCPIP library.
@@ -1448,7 +1221,7 @@ $!
$! Tell The User We Don't Know What They Want.
$!
$ WRITE SYS$OUTPUT ""
-$ WRITE SYS$OUTPUT "The Option ",P5," Is Invalid. The Valid Options Are:"
+$ WRITE SYS$OUTPUT "The Option ",P4," 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."
@@ -1466,10 +1239,9 @@ $!
$! Check if the user wanted to compile just a subset of all the encryption
$! methods.
$!
-$ IF P7 .NES. ""
+$ IF P6 .NES. ""
$ THEN
-$ ENCRYPT_TYPES = P7
-$! NYI: ENCRYPT_PROGRAMS = P7
+$ ENCRYPT_TYPES = P6
$ ENDIF
$!
$! Time To RETURN...
diff --git a/makevms.com b/makevms.com
index 7d1b3227af..6db8a59889 100755
--- a/makevms.com
+++ b/makevms.com
@@ -9,7 +9,7 @@ $!
$! Changes by Richard Levitte <richard@levitte.org>
$!
$! This procedure creates the SSL libraries of "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB"
-$! "[.xxx.EXE.SSL]LIBSSL.OLB" and if specified "[.xxx.EXE.RSAREF]LIBRSAGLUE.OLB".
+$! "[.xxx.EXE.SSL]LIBSSL.OLB"
$! The "xxx" denotes the machine architecture of AXP or VAX.
$!
$! This procedures accepts two command line options listed below.
@@ -21,7 +21,6 @@ $! CONFIG Just build the "[.CRYPTO]OPENSSLCONF.H" file.
$! BUILDINF Just build the "[.CRYPTO]BUILDINF.H" file.
$! SOFTLINKS Just fix the Unix soft links.
$! BUILDALL Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done.
-$! RSAREF Just build the "[.xxx.EXE.RSAREF]LIBRSAGLUE.OLB" library.
$! CRYPTO Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
$! CRYPTO/x Just build the x part of the
$! "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
@@ -32,16 +31,8 @@ $! APPS Just build the "[.xxx.EXE.APPS]" application programs for Open
$! ENGINES Just build the "[.xxx.EXE.ENGINES]" application programs for OpenSSL.
$!
$!
-$! Specify RSAREF as P2 to compile using the RSAREF Library.
-$! If you specify NORSAREF, it will compile without using RSAREF.
-$! (If in the United States, You Must Compile Using RSAREF).
-$!
-$! 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 as that is where the scripts
-$! will look for the files.
+$! P2 is ignored (it was used to denote if RSAref should be used or not,
+$! and is simply kept so surrounding scripts don't get confused)
$!
$! Speficy DEBUG or NODEBUG as P3 to compile with or without debugging
$! information.
@@ -128,20 +119,6 @@ $!
$ IF (BUILDCOMMAND.EQS."ALL".OR.BUILDCOMMAND.EQS."BUILDALL")
$ THEN
$!
-$! Check To See If We Are Going To Be Building The
-$! [.xxx.EXE.RSAREF]LIBRSAGLUE.OLB Library.
-$!
-$ IF (RSAREF.EQS."RSAREF")
-$ THEN
-$!
-$! Build The [.xxx.EXE.RSAREF]LIBRSAGLUE.OLB Library.
-$!
-$ GOSUB RSAREF
-$!
-$! End The RSAREF Check.
-$!
-$ ENDIF
-$!
$! Build The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library.
$!
$ GOSUB CRYPTO
@@ -508,11 +485,6 @@ $ ENDIF
$ GOTO LOOP_SDIRS
$ LOOP_SDIRS_END:
$!
-$! Copy All The ".H" Files From The [.RSAREF] Directory.
-$!
-$! EXHEADER := rsaref.h
-$! COPY SYS$DISK:[.RSAREF]'EXHEADER' SYS$DISK:[.INCLUDE.OPENSSL]
-$!
$! Copy All The ".H" Files From The [.SSL] Directory.
$!
$ EXHEADER := ssl.h,ssl2.h,ssl3.h,ssl23.h,tls1.h,kssl.h
@@ -541,11 +513,11 @@ $ SET DEFAULT SYS$DISK:[.CRYPTO]
$!
$! Build The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library.
$!
-$ @CRYPTO-LIB LIBRARY 'RSAREF' 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" "''ISSEVEN'" "''BUILDPART'"
+$ @CRYPTO-LIB LIBRARY 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" "''ISSEVEN'" "''BUILDPART'"
$!
$! Build The [.xxx.EXE.CRYPTO]*.EXE Test Applications.
$!
-$ @CRYPTO-LIB APPS 'RSAREF' 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN' "''BUILDPART'"
+$ @CRYPTO-LIB APPS 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN' "''BUILDPART'"
$!
$! Go Back To The Main Directory.
$!
@@ -555,34 +527,6 @@ $! Time To RETURN.
$!
$ RETURN
$!
-$! Build The [.xxx.EXE.RSAREF]LIBRSAGLUE Library.
-$!
-$ RSAREF:
-$ WRITE SYS$OUTPUT ""
-$ WRITE SYS$OUTPUT "RSAref glue library not built, since it's no longer needed"
-$ RETURN
-$!
-$! Tell The User What We Are Doing.
-$!
-$ WRITE SYS$OUTPUT ""
-$ WRITE SYS$OUTPUT "Building The [.",ARCH,".EXE.RSAREF]LIBRSAGLUE.OLB Library."
-$!
-$! Go To The [.RSAREF] Directory.
-$!
-$ SET DEFAULT SYS$DISK:[.RSAREF]
-$!
-$! Build The [.xxx.EXE.RSAREF]LIBRSAGLUE.OLB Library.
-$!
-$ @RSAREF-LIB LIBRARY 'DEBUGGER' "''COMPILER'" 'ISSEVEN'
-$!
-$! Go Back To The Main Directory.
-$!
-$ SET DEFAULT [-]
-$!
-$! Time To Return.
-$!
-$ RETURN
-$!
$! Build The "[.xxx.EXE.SSL]LIBSSL.OLB" Library.
$!
$ SSL:
@@ -598,7 +542,7 @@ $ SET DEFAULT SYS$DISK:[.SSL]
$!
$! Build The [.xxx.EXE.SSL]LIBSSL.OLB Library.
$!
-$ @SSL-LIB LIBRARY 'RSAREF' 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN'
+$ @SSL-LIB LIBRARY 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN'
$!
$! Go Back To The Main Directory.
$!
@@ -623,7 +567,7 @@ $ SET DEFAULT SYS$DISK:[.SSL]
$!
$! Build The [.xxx.EXE.SSL]SSL_TASK.EXE
$!
-$ @SSL-LIB SSL_TASK 'RSAREF' 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN'
+$ @SSL-LIB SSL_TASK 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN'
$!
$! Go Back To The Main Directory.
$!
@@ -648,7 +592,7 @@ $ SET DEFAULT SYS$DISK:[.TEST]
$!
$! Build The Test Programs.
$!
-$ @MAKETESTS 'RSAREF' 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN'
+$ @MAKETESTS 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN'
$!
$! Go Back To The Main Directory.
$!
@@ -673,7 +617,7 @@ $ SET DEFAULT SYS$DISK:[.APPS]
$!
$! Build The Application Programs.
$!
-$ @MAKEAPPS 'RSAREF' 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN'
+$ @MAKEAPPS 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN'
$!
$! Go Back To The Main Directory.
$!
@@ -739,7 +683,7 @@ $! Else, Check To See If P1 Has A Valid Arguement.
$!
$ IF (P1.EQS."CONFIG").OR.(P1.EQS."BUILDINF").OR.(P1.EQS."SOFTLINKS") -
.OR.(P1.EQS."BUILDALL") -
- .OR.(P1.EQS."CRYPTO").OR.(P1.EQS."SSL").OR.(P1.EQS."RSAREF") -
+ .OR.(P1.EQS."CRYPTO").OR.(P1.EQS."SSL") -
.OR.(P1.EQS."SSL_TASK").OR.(P1.EQS."TEST").OR.(P1.EQS."APPS")
$ THEN
$!
@@ -787,54 +731,6 @@ $! End The P1 Check.
$!
$ ENDIF
$!
-$! Check To See If P2 Is Blank.
-$!
-$ P2 = "NORSAREF"
-$ IF (P2.EQS."NORSAREF")
-$ THEN
-$!
-$! P2 Is NORSAREF, So Compile Without RSAREF.
-$!
-$ RSAREF = "NORSAREF"
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$! Check To See If We Are To Compile Using The RSAREF Library.
-$!
-$ IF (P2.EQS."RSAREF")
-$ THEN
-$!
-$! Compile With RSAREF Library.
-$!
-$ RSAREF = "RSAREF"
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$! 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 ""
-$ WRITE SYS$OUTPUT " RSAREF : To Compile With The RSAREF Library."
-$ WRITE SYS$OUTPUT " NORSAREF : To Compile With The Regular RSA Library."
-$ WRITE SYS$OUTPUT ""
-$!
-$! Time To EXIT.
-$!
-$ EXIT
-$!
-$! End The Valid Arguemnt Check.
-$!
-$ ENDIF
-$!
-$! End The P2 Check.
-$!
-$ ENDIF
-$!
$! Check To See If P3 Is Blank.
$!
$ IF (P3.EQS."NODEBUG")
diff --git a/ssl/ssl-lib.com b/ssl/ssl-lib.com
index d6829a8d64..163ade9f7a 100644
--- a/ssl/ssl-lib.com
+++ b/ssl/ssl-lib.com
@@ -21,22 +21,10 @@ $!
$! LIBRARY To just compile the [.xxx.EXE.SSL]LIBSSL.OLB Library.
$! SSL_TASK To just compile the [.xxx.EXE.SSL]SSL_TASK.EXE
$!
-$! Specify RSAREF as P2 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 as P3 to compile with or without debugger
+$! Specify DEBUG or NODEBUG as P2 to compile with or without debugger
$! information.
$!
-$! Specify which compiler at P4 to try to compile under.
+$! Specify which compiler at P3 to try to compile under.
$!
$! VAXC For VAX C.
$! DECC For DEC C.
@@ -45,14 +33,14 @@ $!
$! If you don't speficy a compiler, it will try to determine which
$! "C" compiler to use.
$!
-$! P5, if defined, sets a TCP/IP library to use, through one of the following
+$! P4, if defined, sets a TCP/IP library to use, through one of the following
$! keywords:
$!
$! UCX for UCX
$! TCPIP for TCPIP (post UCX)
$! SOCKETSHR for SOCKETSHR+NETLIB
$!
-$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
+$! P5, 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.
@@ -135,10 +123,6 @@ $! Define The CRYPTO-LIB We Are To Use.
$!
$ 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
-$!
$! Check To See What We Are To Do.
$!
$ IF (BUILDALL.EQS."TRUE")
@@ -317,73 +301,31 @@ $!
$ ON ERROR THEN GOTO SSL_TASK_END
$ CC5/OBJECT='OBJ_DIR'SSL_TASK.OBJ SYS$DISK:[]SSL_TASK.C
$!
-$! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
+$! Link The Program.
+$! Check To See If We Are To Link With A Specific TCP/IP Library.
$!
-$ IF (RSAREF.EQS."TRUE")
+$ IF (TCPIP_LIB.NES."")
$ 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_DIR'SSL_TASK.EXE -
- 'OBJ_DIR'SSL_TASK.OBJ, -
- 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
- 'TCPIP_LIB','OPT_FILE'/OPTION
+$! Link With TCP/IP Library.
$!
-$! Else...
-$!
-$ ELSE
-$!
-$! Link With The RSAREF Library And NO TCP/IP Library.
-$!
-$ LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR'SSL_TASK.EXE -
- 'OBJ_DIR'SSL_TASK.OBJ, -
- 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
- 'OPT_FILE'/OPTION
-$!
-$! End The TCP/IP Library Check.
-$!
-$ ENDIF
+$ LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR'SSL_TASK.EXE -
+ 'OBJ_DIR'SSL_TASK.OBJ, -
+ 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
+ 'TCPIP_LIB','OPT_FILE'/OPTION
$!
$! Else...
$!
$ ELSE
$!
-$! Don't Link With The RSAREF Routines.
+$! Don't Link With TCP/IP Library.
$!
+$ LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR'SSL_TASK.EXE -
+ 'OBJ_DIR'SSL_TASK.OBJ,-
+ 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
+ 'OPT_FILE'/OPTION
$!
-$! 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'/EXE='EXE_DIR'SSL_TASK.EXE -
- 'OBJ_DIR'SSL_TASK.OBJ, -
- 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
- 'TCPIP_LIB','OPT_FILE'/OPTION
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
-$!
-$ LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR'SSL_TASK.EXE -
- 'OBJ_DIR'SSL_TASK.OBJ,-
- '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
$!
@@ -558,35 +500,6 @@ $! End The LIBCRYPTO.OLB Library Check.
$!
$ ENDIF
$!
-$! Check To 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
-$!
-$! End The LIBRSAGLUE.OLB Library Check.
-$!
-$ ENDIF
-$!
-$! End The RSAREF Library Check.
-$!
-$ ENDIF
-$!
$! Time To Return.
$!
$ RETURN
@@ -650,78 +563,10 @@ $ ENDIF
$!
$! Check To See If P2 Is Blank.
$!
-$ p2 = "NORSAREF"
-$ IF (P2.EQS."NORSAREF")
+$ IF (P2.EQS."NODEBUG")
$ THEN
$!
-$! P2 Is NORSAREF, So Compile With The Regular RSA Libraries.
-$!
-$ RSAREF = "FALSE"
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$! Check To See If We Are To Use The RSAREF Library.
-$!
-$ IF (P2.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 ",P2," 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 P2 Check.
-$!
-$ ENDIF
-$!
-$! Check To See If P3 Is Blank.
-$!
-$ IF (P3.EQS."NODEBUG")
-$ THEN
-$!
-$! P3 Is NODEBUG, So Compile Without Debugger Information.
+$! P2 Is NODEBUG, So Compile Without Debugger Information.
$!
$ DEBUGGER = "NODEBUG"
$ TRACEBACK = "NOTRACEBACK"
@@ -736,7 +581,7 @@ $ ELSE
$!
$! Check To See If We Are To Compile With Debugger Information.
$!
-$ IF (P3.EQS."DEBUG")
+$ IF (P2.EQS."DEBUG")
$ THEN
$!
$! Compile With Debugger Information.
@@ -752,7 +597,7 @@ $!
$! Tell The User Entered An Invalid Option..
$!
$ 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 " DEBUG : Compile With The Debugger Information."
$ WRITE SYS$OUTPUT " NODEBUG : Compile Without The Debugger Information."
@@ -766,7 +611,7 @@ $! End The Valid Arguement Check.
$!
$ ENDIF
$!
-$! End The P3 Check.
+$! End The P2 Check.
$!
$ ENDIF
$!
@@ -776,9 +621,9 @@ $! Written By: Richard Levitte
$! richard@levitte.org
$!
$!
-$! Check To See If We Have A Option For P6.
+$! Check To See If We Have A Option For P5.
$!
-$ IF (P6.EQS."")
+$ IF (P5.EQS."")
$ THEN
$!
$! Get The Version Of VMS We Are Using.
@@ -800,13 +645,13 @@ $! End The VMS Version Check.
$!
$ ENDIF
$!
-$! End The P6 Check.
+$! End The P5 Check.
$!
$ ENDIF
$!
-$! Check To See If P4 Is Blank.
+$! Check To See If P3 Is Blank.
$!
-$ IF (P4.EQS."")
+$ IF (P3.EQS."")
$ THEN
$!
$! O.K., The User Didn't Specify A Compiler, Let's Try To
@@ -819,7 +664,7 @@ $ THEN
$!
$! Looks Like GNUC, Set To Use GNUC.
$!
-$ P4 = "GNUC"
+$ P3 = "GNUC"
$!
$! End The GNU C Compiler Check.
$!
@@ -832,7 +677,7 @@ $ THEN
$!
$! Looks Like DECC, Set To Use DECC.
$!
-$ P4 = "DECC"
+$ P3 = "DECC"
$!
$! Else...
$!
@@ -840,7 +685,7 @@ $ ELSE
$!
$! Looks Like VAXC, Set To Use VAXC.
$!
-$ P4 = "VAXC"
+$ P3 = "VAXC"
$!
$! End The VAXC Compiler Check.
$!
@@ -854,9 +699,9 @@ $! End The Compiler Check.
$!
$ ENDIF
$!
-$! 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
$!
$! Find out what socket library we have available
@@ -866,7 +711,7 @@ $ THEN
$!
$! We have SOCKETSHR, and it is my opinion that it's the best to use.
$!
-$ P5 = "SOCKETSHR"
+$ P4 = "SOCKETSHR"
$!
$! Tell the user
$!
@@ -886,7 +731,7 @@ $ THEN
$!
$! Last resort: a UCX or UCX-compatible library
$!
-$ P5 = "UCX"
+$ P4 = "UCX"
$!
$! Tell the user
$!
@@ -900,7 +745,7 @@ $ ENDIF
$!
$! Set Up Initial CC Definitions, Possibly With User Ones
$!
-$ CCDEFS = "TCPIP_TYPE_''P5'"
+$ CCDEFS = "TCPIP_TYPE_''P4'"
$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
$ CCEXTRAFLAGS = ""
$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
@@ -910,12 +755,12 @@ $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
$!
$! Check To See If The User Entered A Valid Paramter.
$!
-$ IF (P4.EQS."VAXC").OR.(P4.EQS."DECC").OR.(P4.EQS."GNUC")
+$ IF (P3.EQS."VAXC").OR.(P3.EQS."DECC").OR.(P3.EQS."GNUC")
$ THEN
$!
$! Check To See If The User Wanted DECC.
$!
-$ IF (P4.EQS."DECC")
+$ IF (P3.EQS."DECC")
$ THEN
$!
$! Looks Like DECC, Set To Use DECC.
@@ -945,7 +790,7 @@ $ ENDIF
$!
$! Check To See If We Are To Use VAXC.
$!
-$ IF (P4.EQS."VAXC")
+$ IF (P3.EQS."VAXC")
$ THEN
$!
$! Looks Like VAXC, Set To Use VAXC.
@@ -983,7 +828,7 @@ $ ENDIF
$!
$! Check To See If We Are To Use GNU C.
$!
-$ IF (P4.EQS."GNUC")
+$ IF (P3.EQS."GNUC")
$ THEN
$!
$! Looks Like GNUC, Set To Use GNUC.
@@ -1012,31 +857,6 @@ $! Set up default defines
$!
$ 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"
@@ -1076,7 +896,7 @@ $!
$! 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 " VAXC : To Compile With VAX C."
$ WRITE SYS$OUTPUT " DECC : To Compile With DEC C."
@@ -1090,13 +910,13 @@ $ ENDIF
$!
$! Time to check the contents, and to make sure we get the correct library.
$!
-$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" -
- .OR. P5.EQS."TCPIP" .OR. P5.EQS."NONE"
+$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" -
+ .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
$ THEN
$!
$! Check to see if SOCKETSHR was chosen
$!
-$ IF P5.EQS."SOCKETSHR"
+$ IF P4.EQS."SOCKETSHR"
$ THEN
$!
$! Set the library to use SOCKETSHR
@@ -1109,12 +929,12 @@ $ ENDIF
$!
$! Check to see if MULTINET was chosen
$!
-$ IF P5.EQS."MULTINET"
+$ IF P4.EQS."MULTINET"
$ THEN
$!
$! Set the library to use UCX emulation.
$!
-$ P5 = "UCX"
+$ P4 = "UCX"
$!
$! Done with MULTINET
$!
@@ -1122,7 +942,7 @@ $ ENDIF
$!
$! Check to see if UCX was chosen
$!
-$ IF P5.EQS."UCX"
+$ IF P4.EQS."UCX"
$ THEN
$!
$! Set the library to use UCX.
@@ -1142,7 +962,7 @@ $ ENDIF
$!
$! Check to see if TCPIP was chosen
$!
-$ IF P5.EQS."TCPIP"
+$ IF P4.EQS."TCPIP"
$ THEN
$!
$! Set the library to use TCPIP (post UCX).
@@ -1155,7 +975,7 @@ $ ENDIF
$!
$! Check to see if NONE was chosen
$!
-$ IF P5.EQS."NONE"
+$ IF P4.EQS."NONE"
$ THEN
$!
$! Do not use a TCPIP library.
@@ -1177,7 +997,7 @@ $!
$! Tell The User We Don't Know What They Want.
$!
$ WRITE SYS$OUTPUT ""
-$ WRITE SYS$OUTPUT "The Option ",P5," Is Invalid. The Valid Options Are:"
+$ WRITE SYS$OUTPUT "The Option ",P4," 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."
diff --git a/test/maketests.com b/test/maketests.com
index 0026cf003f..da32daaa7f 100644
--- 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.
$!
-$! 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.
$!
-$! 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.
@@ -40,13 +28,13 @@ $!
$! 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
$!
-$! 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.
@@ -91,10 +79,6 @@ $! Define The CRYPTO-LIB We Are To Use.
$!
$ 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
@@ -228,74 +212,32 @@ $!
$ 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
$!
-$! 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
$!
-$! 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
$!
-$! 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.
$!
@@ -460,32 +402,6 @@ $! End The Crypto Library Check.
$!
$ 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."")
@@ -516,75 +432,10 @@ $ CHECK_OPTIONS:
$!
$! Check To See If P1 Is Blank.
$!
-$ P1 = "NORSAREF"
-$ IF (P1.EQS."NORSAREF")
-$ 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")
+$ IF (P1.EQS."NODEBUG")
$ THEN
$!
-$! P2 Is NODEBUG, So Compile Without Debugger Information.
+$! P1 Is NODEBUG, So Compile Without Debugger Information.
$!
$ DEBUGGER = "NODEBUG"
$ TRACEBACK = "NOTRACEBACK"
@@ -599,7 +450,7 @@ $ ELSE
$!
$! Check To See If We Are To Compile With Debugger Information.
$!
-$ IF (P2.EQS."DEBUG")
+$ IF (P1.EQS."DEBUG")
$ THEN
$!
$! Compile With Debugger Information.
@@ -618,7 +469,7 @@ $!
$! 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."
@@ -632,13 +483,13 @@ $! End The Valid Arguement Check.
$!
$ ENDIF
$!
-$! End The P3 Check.
+$! End The P2 Check.
$!
$ 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
@@ -651,7 +502,7 @@ $ THEN
$!
$! Looks Like GNUC, Set To Use GNUC.
$!
-$ P3 = "GNUC"
+$ P2 = "GNUC"
$!
$! End The GNU C Compiler Check.
$!
@@ -664,7 +515,7 @@ $ THEN
$!
$! Looks Like DECC, Set To Use DECC.
$!
-$ P3 = "DECC"
+$ P2 = "DECC"
$!
$! Else...
$!
@@ -672,7 +523,7 @@ $ ELSE
$!
$! Looks Like VAXC, Set To Use VAXC.
$!
-$ P3 = "VAXC"
+$ P2 = "VAXC"
$!
$! End The VAXC Compiler Check.
$!
@@ -686,9 +537,9 @@ $! End The Compiler Check.
$!
$ 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
@@ -698,7 +549,7 @@ $ THEN
$!
$! We have SOCKETSHR, and it is my opinion that it's the best to use.
$!
-$ P4 = "SOCKETSHR"
+$ P3 = "SOCKETSHR"
$!
$! Tell the user
$!
@@ -718,7 +569,7 @@ $ THEN
$!
$! Last resort: a UCX or UCX-compatible library
$!
-$ P4 = "UCX"
+$ P3 = "UCX"
$!
$! Tell the user
$!
@@ -732,7 +583,7 @@ $ ENDIF
$!
$! Set Up Initial CC Definitions, Possibly With User Ones
$!
-$ CCDEFS = "TCPIP_TYPE_''P4'"
+$ 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
@@ -742,12 +593,12 @@ $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
$!
$! 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.
$!
-$ IF (P3.EQS."DECC")
+$ IF (P2.EQS."DECC")
$ THEN
$!
$! Looks Like DECC, Set To Use DECC.
@@ -777,7 +628,7 @@ $ ENDIF
$!
$! 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.
@@ -815,7 +666,7 @@ $ ENDIF
$!
$! 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.
@@ -843,31 +694,6 @@ $! Set up default defines
$!
$ 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"
@@ -897,7 +723,7 @@ $!
$! 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."
@@ -911,13 +737,13 @@ $ ENDIF
$!
$! 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" -
- .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
+$ 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
$!
-$ IF P4.EQS."SOCKETSHR"
+$ IF P3.EQS."SOCKETSHR"
$ THEN
$!
$! Set the library to use SOCKETSHR
@@ -930,12 +756,12 @@ $ ENDIF
$!
$! Check to see if MULTINET was chosen
$!
-$ IF P4.EQS."MULTINET"
+$ IF P3.EQS."MULTINET"
$ THEN
$!
$! Set the library to use UXC emulation.
$!
-$ P4 = "UCX"
+$ P3 = "UCX"
$!
$! Done with MULTINET
$!
@@ -943,7 +769,7 @@ $ ENDIF
$!
$! Check to see if UCX was chosen
$!
-$ IF P4.EQS."UCX"
+$ IF P3.EQS."UCX"
$ THEN
$!
$! Set the library to use UCX.
@@ -963,7 +789,7 @@ $ ENDIF
$!
$! Check to see if TCPIP was chosen
$!
-$ IF P4.EQS."TCPIP"
+$ IF P3.EQS."TCPIP"
$ THEN
$!
$! Set the library to use TCPIP (post UCX).
@@ -976,7 +802,7 @@ $ ENDIF
$!
$! Check to see if NONE was chosen
$!
-$ IF P4.EQS."NONE"
+$ IF P3.EQS."NONE"
$ THEN
$!
$! Do not use a TCPIP library.
@@ -998,7 +824,7 @@ $!
$! 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."
@@ -1019,9 +845,9 @@ $! Written By: Richard Levitte
$! 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.
@@ -1043,7 +869,7 @@ $! End The VMS Version Check.
$!
$ ENDIF
$!
-$! End The P5 Check.
+$! End The P4 Check.
$!
$ ENDIF
$!