Commit 407a4101 authored by Richard Levitte's avatar Richard Levitte
Browse files

Have the VMS build system catch up with the 1.0.0-stable branch.

parent 9921f865

apps/makeapps.com

+6 −5
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ $! A-Com Computing, Inc. 
$!               byer@mail.all-net.net

$!

$!  Changes by Richard Levitte <richard@levitte.org>

$!             Zoltan Arpadffy <zoli@polarhome.com>   

$!

$!  This command files compiles and creates all the various different

$!  "application" programs for the different types of encryption for OpenSSL.
@@ -150,7 +151,7 @@ $ IF COMPILER .EQS. "VAXC" THEN - 
$!

$! Setup exceptional compilations

$!

$ COMPILEWITH_CC2 = ",S_SERVER,S_CLIENT,"

$ COMPILEWITH_CC2 = ",S_SOCKET,S_SERVER,S_CLIENT,"

$!

$ PHASE := LIB

$!
@@ -168,6 +169,10 @@ $! Make The Application File Name 
$!

$ CURRENT_APP = F$EDIT(F$ELEMENT(APP_COUNTER,",",PROGRAMS),"TRIM")

$!

$!  Create The Executable File Name.

$!

$   EXE_FILE = EXE_DIR + CURRENT_APP + ".EXE"

$!

$!  Check To See If We Are At The End Of The File List.

$!

$ IF (CURRENT_APP.EQS.",")
@@ -231,10 +236,6 @@ $! 
$!  Create The Object File Name.

$!

$   OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"

$!

$!  Create The Executable File Name.

$!

$   EXE_FILE = EXE_DIR + FILE_NAME + ".EXE"

$   ON WARNING THEN GOTO NEXT_LIB

$!

$!  Check To See If The File We Want To Compile Actually Exists.

crypto/crypto-lib.com

+4 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ $! A-Com Computing, Inc. 
$!               byer@mail.all-net.net

$!

$!  Changes by Richard Levitte <richard@levitte.org>

$!             Zoltan Arpadffy <arpadffy@polarhome.com>

$!

$!  This command files compiles and creates the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" 

$!  library for OpenSSL.  The "xxx" denotes the machine architecture, ALPHA,
@@ -192,7 +193,8 @@ $ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ - 
$ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb"

$ LIB_MODES = "cbc128,ctr128,cfb128,ofb128"

$ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"

$ IF F$TRNLNM("OPENSSL_NO_ASM").OR.ARCH.NES."VAX" THEN LIB_BN_ASM = "bn_asm"

$ IF F$TRNLNM("OPENSSL_NO_ASM") .OR. ARCH .NES. "VAX" THEN -

     LIB_BN_ASM = "bn_asm"

$ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_ctx,bn_mul,bn_mod,"+ -

	"bn_print,bn_rand,bn_shift,bn_word,bn_blind,"+ -

	"bn_kron,bn_sqrt,bn_gcd,bn_prime,bn_err,bn_sqr,"+LIB_BN_ASM+","+ -
@@ -217,7 +219,7 @@ $ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ - 
	"eng_table,eng_pkey,eng_fat,eng_all,"+ -

	"tb_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ -

	"tb_cipher,tb_digest,tb_pkmeth,tb_asnmth,"+ -

	"eng_openssl,eng_dyn,eng_cnf,eng_cryptodev,"+ -

	"eng_openssl,eng_dyn,eng_cnf,eng_cryptodev"+ -

	"eng_aesni"

$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr,"+ -

	"aes_ige,aes_wrap"

crypto/install.com

+9 −8
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ $! 
$! Author: Richard Levitte <richard@levitte.org>

$! Time of creation: 22-MAY-1998 10:13

$!

$! Changes by Zoltan Arpadffy <zoli@polarhome.com>

$!

$! P1	root of the directory tree

$!

$	IF P1 .EQS. ""
@@ -47,8 +49,8 @@ $ SDIRS := ,- 
		 EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,-

		 UI,KRB5,-

		 STORE,CMS,PQUEUE,TS,JPAKE

$	EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,-

		symhacks.h,ossl_typ.h

$	EXHEADER_ := crypto.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h,-

		ossl_typ.h

$	EXHEADER_OBJECTS := objects.h,obj_mac.h

$	EXHEADER_MD2 := md2.h

$	EXHEADER_MD4 := md4.h
@@ -105,8 +107,7 @@ $ EXHEADER_TS := ts.h 
$	EXHEADER_JPAKE := jpake.h

$	LIBS := LIBCRYPTO

$

$	VEXE_DIR := [-.VAX.EXE.CRYPTO]

$	AEXE_DIR := [-.AXP.EXE.CRYPTO]

$	EXE_DIR := [-.'ARCH'.EXE.CRYPTO]

$

$	I = 0

$ LOOP_SDIRS:
@@ -130,15 +131,15 @@ $ E = F$EDIT(F$ELEMENT(I, ",", LIBS),"TRIM") 
$	I = I + 1

$	IF E .EQS. "," THEN GOTO LOOP_LIB_END

$	SET NOON

$	IF F$SEARCH(VEXE_DIR+E+".OLB") .NES. ""

$	IF F$SEARCH(EXE_DIR+E+".OLB") .NES. ""

$	THEN

$	  COPY 'VEXE_DIR''E'.OLB WRK_SSLLIB:'E'.OLB/log

$	  COPY 'EXE_DIR''E'.OLB WRK_SSLLIB:'E'.OLB/log

$	  SET FILE/PROT=W:RE WRK_SSLLIB:'E'.OLB

$	ENDIF

$	! Preparing for the time when we have shareable images

$	IF F$SEARCH(VEXE_DIR+E+".EXE") .NES. ""

$	IF F$SEARCH(EXE_DIR+E+".EXE") .NES. ""

$	THEN

$	  COPY 'VEXE_DIR''E'.EXE WRK_SSLLIB:'E'.EXE/log

$	  COPY 'EXE_DIR''E'.EXE WRK_SSLLIB:'E'.EXE/log

$	  SET FILE/PROT=W:RE WRK_SSLLIB:'E'.EXE

$	ENDIF

$	SET ON

engines/makeengines.com

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ $! 
$! Do the dirty work.

$!

$ ON ERROR THEN GOTO FILE_NEXT

$ IF FILE_NAME - ".MAR" .NES. FILE_NAME

$ IF F$EDIT(F$PARSE(SOURCE_FILE,,,"TYPE","SYNTAX_ONLY"),"UPCASE") .EQS. ".MAR"

$ THEN

$   MACRO/OBJECT='OBJECT_FILE' 'SOURCE_FILE'

$ ELSE

makevms.com

+12 −5
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ $! A-Com Computing, Inc. 
$!                byer@mail.all-net.net

$!

$! Changes by Richard Levitte <richard@levitte.org>

$!	      Zoltan Arpadffy <zoli@polarhome.com>

$!

$! This procedure creates the SSL libraries of "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB"

$! "[.xxx.EXE.SSL]LIBSSL.OLB"
@@ -37,7 +38,7 @@ $! 
$! Speficy DEBUG or NODEBUG as P3 to compile with or without debugging

$! information.

$!

$! Specify which compiler at P4 to try to compile under.

$! Specify which compiler as P4 to try to compile under.

$!

$!	  VAXC	 For VAX C.

$!	  DECC	 For DEC C.
@@ -264,10 +265,10 @@ $ GOTO TIDY 
$     ENDIF

$   ENDIF

$ ENDIF

$ IF ARCH .EQS. "AXP"

$ IF ARCH .NES. "VAX"

$ THEN

$!

$!  Write the Alpha specific data

$!  Write the non-VAX specific data

$!

$   WRITE H_FILE "#if defined(HEADER_RC4_H)"

$   WRITE H_FILE "#undef RC4_INT"
@@ -735,7 +736,8 @@ $! 
$   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."SSL_TASK").OR.(P1.EQS."TEST").OR.(P1.EQS."APPS")

       .OR.(P1.EQS."SSL_TASK").OR.(P1.EQS."TEST").OR.(P1.EQS."APPS") -

       .OR.(P1.EQS."ENGINES")

$   THEN

$!

$!    A Valid Arguement.
@@ -749,7 +751,11 @@ $! 
$!    Tell The User We Don't Know What They Want.

$!

$     WRITE SYS$OUTPUT ""

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

$     WRITE SYS$OUTPUT "USAGE:   @MAKEVMS.COM [Target] [not-used option] [Debug option] <Compiler>"

$     WRITE SYS$OUTPUT ""

$     WRITE SYS$OUTPUT "Example: @MAKEVMS.COM ALL """" NODEBUG "

$     WRITE SYS$OUTPUT ""

$     WRITE SYS$OUTPUT "The Target ",P1," Is Invalid.  The Valid Target Options Are:"

$     WRITE SYS$OUTPUT ""

$     WRITE SYS$OUTPUT "    ALL      :  Just Build Everything."

$     WRITE SYS$OUTPUT "    CONFIG   :  Just build the [.CRYPTO.''ARCH']OPENSSLCONF.H file."
@@ -763,6 +769,7 @@ $ WRITE SYS$OUTPUT " SSL : To Build Just The [.xxx.EXE.SSL]LIBSSL.O 
$     WRITE SYS$OUTPUT "    SSL_TASK :  To Build Just The [.xxx.EXE.SSL]SSL_TASK.EXE Program."

$     WRITE SYS$OUTPUT "    TEST     :  To Build Just The OpenSSL Test Programs."

$     WRITE SYS$OUTPUT "    APPS     :  To Build Just The OpenSSL Application Programs."

$     WRITE SYS$OUTPUT "    ENGINES  :  To Build Just The ENGINES"

$     WRITE SYS$OUTPUT ""

$     WRITE SYS$OUTPUT " Where 'xxx' Stands For:"

$     WRITE SYS$OUTPUT ""