Allow the use of the TCP/IP stack keyword TCPIP and NONE (b935754c) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/makeapps.com

+34 −5

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ $! 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)
		$!
		@@ -963,7 +964,8 @@ $ 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"
		$ 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
		@@ -973,7 +975,7 @@ $ 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
		$!
		@@ -999,19 +1001,45 @@ $ 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
		$ 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 -
		TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT"
		TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
		$ ENDIF
		$!
		$! Done with UCX
		$!
		$ ENDIF
		$!
		$! Check to see if TCPIP (post UCX) was chosen
		$!
		$ IF P4.EQS."TCPIP"
		$ THEN
		$!
		$! Set the library to use TCPIP.
		$!
		$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
		$!
		$! Done with TCPIP
		$!
		$ ENDIF
		$!
		$! Check to see if NONE was chosen
		$!
		$ IF P4.EQS."NONE"
		$ THEN
		$!
		$! Do not use TCPIP.
		$!
		$ TCPIP_LIB = ""
		$!
		$! Done with TCPIP
		$!
		$ ENDIF
		$!
		$! Add TCP/IP type to CC definitions.
		$!
		$ CCDEFS = CCDEFS + ",TCPIP_TYPE_''P4'"
		@@ -1031,6 +1059,7 @@ $ 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."
		$ WRITE SYS$OUTPUT " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
		$ WRITE SYS$OUTPUT ""
		$!
		$! Time To EXIT.

crypto/crypto-lib.com

+34 −5

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ $! P5, 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)
		@@ -1358,7 +1359,8 @@ $ WRITE 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"
		$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" -
		.OR. P5.EQS."TCPIP" .OR. P5.EQS."NONE"
		$ THEN
		$!
		$! Check to see if SOCKETSHR was chosen
		@@ -1368,7 +1370,7 @@ $ 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
		$!
		@@ -1394,19 +1396,45 @@ $ 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
		$ 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 -
		TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT"
		TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
		$ ENDIF
		$!
		$! Done with UCX
		$!
		$ ENDIF
		$!
		$! Check to see if TCPIP was chosen
		$!
		$ IF P5.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 P5.EQS."NONE"
		$ THEN
		$!
		$! Do not use a TCPIP library.
		$!
		$ TCPIP_LIB = ""
		$!
		$! Done with TCPIP
		$!
		$ ENDIF
		$!
		$! Print info
		$!
		$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
		@@ -1422,6 +1450,7 @@ $ WRITE SYS$OUTPUT "The Option ",P5," 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 " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
		$ WRITE SYS$OUTPUT ""
		$!
		$! Time To EXIT.

makevms.com

+59 −7

Original line number	Diff line number	Diff line
		@@ -60,7 +60,12 @@ $! P5, if defined, sets a TCP/IP library to use, through one of the following
		$! keywords:
		$!
		$! UCX for UCX or UCX emulation
		$! TCPIP for TCP/IP Services or TCP/IP Services emulation
		$! (this is prefered over UCX)
		$! SOCKETSHR for SOCKETSHR+NETLIB
		$! NONE to avoid specifying which TCP/IP implementation to
		$! use at build time (this works with DEC C). This is
		$! the default.
		$!
		$! P6, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
		$!
		@@ -377,7 +382,7 @@ $ SOFTLINKS:
		$!
		$! Tell The User We Are Partly Rebuilding The [.TEST] Directory.
		$!
		$ WRITE SYS$OUTPUT "Rebuilding The '[.APPS]MD5.C' And '[.APPS]RMD160.C' Files."
		$ WRITE SYS$OUTPUT "Rebuilding The '[.APPS]MD4.C', '[.APPS]MD5.C' And '[.APPS]RMD160.C' Files."
		$!
		$ DELETE SYS$DISK:[.APPS]MD4.C;,MD5.C;,RMD160.C;*
		$!
		@@ -1001,7 +1006,8 @@ $ ENDIF
		$!
		$! Time to check the contents of P5, and to make sure we get the correct library.
		$!
		$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX"
		$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" -
		.OR. P5.EQS."TCPIP" .OR. P5.EQS."NONE"
		$ THEN
		$!
		$! Check to see if SOCKETSHR was chosen
		@@ -1011,7 +1017,7 @@ $ THEN
		$!
		$! Set the library to use SOCKETSHR
		$!
		$ TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT"
		$ TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
		$!
		$! Tell the user
		$!
		@@ -1045,7 +1051,7 @@ $ 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"
		$!
		$! Tell the user
		$!
		@@ -1055,6 +1061,40 @@ $! Done with UCX
		$!
		$ ENDIF
		$!
		$! Check to see if TCPIP was chosen
		$!
		$ IF P5.EQS."TCPIP"
		$ THEN
		$!
		$! Set the library to use TCPIP (post UCX).
		$!
		$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
		$!
		$! Tell the user
		$!
		$ WRITE SYS$OUTPUT "Using TCPIP (post UCX) for TCP/IP"
		$!
		$! Done with TCPIP
		$!
		$ ENDIF
		$!
		$! Check to see if NONE was chosen
		$!
		$ IF P5.EQS."NONE"
		$ THEN
		$!
		$! Do not use a TCPIP library.
		$!
		$ TCPIP_LIB = ""
		$!
		$! Tell the user
		$!
		$ WRITE SYS$OUTPUT "A specific TCPIP library will not be used."
		$!
		$! Done with NONE.
		$!
		$ ENDIF
		$!
		$! Set the TCPIP_TYPE symbol
		$!
		$ TCPIP_TYPE = P5
		@@ -1076,6 +1116,8 @@ $ WRITE SYS$OUTPUT "The Option ",P5," 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 " TCPIP : To link with TCPIP TCP/IP (post UCX) library."
		$ WRITE SYS$OUTPUT " NONE : To not link with a specific TCP/IP library."
		$ WRITE SYS$OUTPUT ""
		$!
		$! Time To EXIT.
		@@ -1083,10 +1125,20 @@ $!
		$ EXIT
		$ ELSE
		$!
		$! If TCPIP is not defined, then hardcode it to make
		$! it clear that no TCPIP is desired.
		$!
		$ IF P5 .EQS. ""
		$ THEN
		$ TCPIP_LIB = ""
		$ TCPIP_TYPE = "NONE"
		$ ELSE
		$!
		$! Set the TCPIP_TYPE symbol
		$!
		$ TCPIP_TYPE = P5
		$ ENDIF
		$ ENDIF
		$!
		$! Done with TCP/IP libraries
		$!

ssl/ssl-lib.com

+34 −5

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ $! P5, 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)
		@@ -1087,7 +1088,8 @@ $ 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"
		$ IF P5.EQS."SOCKETSHR" .OR. P5.EQS."MULTINET" .OR. P5.EQS."UCX" -
		.OR. P5.EQS."TCPIP" .OR. P5.EQS."NONE"
		$ THEN
		$!
		$! Check to see if SOCKETSHR was chosen
		@@ -1097,7 +1099,7 @@ $ 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
		$!
		@@ -1123,19 +1125,45 @@ $ 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
		$ 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 -
		TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT"
		TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
		$ ENDIF
		$!
		$! Done with UCX
		$!
		$ ENDIF
		$!
		$! Check to see if TCPIP was chosen
		$!
		$ IF P5.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 P5.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
		@@ -1151,6 +1179,7 @@ $ WRITE SYS$OUTPUT "The Option ",P5," 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 " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
		$ WRITE SYS$OUTPUT ""
		$!
		$! Time To EXIT.

test/maketests.com

+4 −4

Original line number	Diff line number	Diff line
		@@ -920,7 +920,7 @@ $ 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
		$!
		@@ -946,13 +946,13 @@ $ 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
		$ 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 -
		TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT"
		TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
		$ ENDIF
		$!
		$! Done with UCX