Commit 26397d2e authored by Richard Levitte's avatar Richard Levitte
Browse files

Synchronise VMS build system with the Unixly one

parent 85b2c0ce

crypto/crypto-lib.com

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ $ ENCRYPT_TYPES = "Basic,"+ - 
		  "BUFFER,BIO,STACK,LHASH,RAND,ERR,"+ -

		  "EVP,EVP_2,EVP_3,ASN1,ASN1_2,PEM,X509,X509V3,"+ -

		  "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,"+ -

		  "STORE,CMS,PQUEUE,TS"

		  "STORE,CMS,PQUEUE,TS,JPAKE"

$!

$! Check To Make Sure We Have Valid Command Line Parameters.

$!
@@ -288,6 +288,7 @@ $ LIB_PQUEUE = "pqueue" 
$ LIB_TS = "ts_err,ts_req_utils,ts_req_print,ts_rsp_utils,ts_rsp_print,"+ -

	"ts_rsp_sign,ts_rsp_verify,ts_verify_ctx,ts_lib,ts_conf,"+ -

	"ts_asn1"

$ LIB_JPAKE = "jpake,jpake_err"

$!

$! Setup exceptional compilations

$!

crypto/install.com

+5 −4
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ $ 
$	SDIRS := ,-

		 OBJECTS,-

		 MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-

		 DES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-

		 BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,AES,-

		 DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-

		 BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,-

		 BUFFER,BIO,STACK,LHASH,RAND,ERR,-

		 EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,-

		 UI,KRB5,-

		 STORE,CMS,PQUEUE,TS

		 STORE,CMS,PQUEUE,TS,JPAKE

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

		symhacks.h,ossl_typ.h

$	EXHEADER_OBJECTS := objects.h,obj_mac.h
@@ -53,6 +53,7 @@ $ EXHEADER_HMAC := hmac.h 
$	EXHEADER_RIPEMD := ripemd.h

$	EXHEADER_WHRLPOOL := whrlpool.h

$	EXHEADER_DES := des.h,des_old.h

$	EXHEADER_AES := aes.h

$	EXHEADER_RC2 := rc2.h

$	EXHEADER_RC4 := rc4.h

$	EXHEADER_RC5 := rc5.h
@@ -70,7 +71,6 @@ $ EXHEADER_DH := dh.h 
$	EXHEADER_ECDH := ecdh.h

$	EXHEADER_DSO := dso.h

$	EXHEADER_ENGINE := engine.h

$	EXHEADER_AES := aes.h

$	EXHEADER_BUFFER := buffer.h

$	EXHEADER_BIO := bio.h

$	EXHEADER_STACK := stack.h,safestack.h
@@ -95,6 +95,7 @@ $ EXHEADER_STORE := store.h 
$	EXHEADER_CMS := cms.h

$	EXHEADER_PQUEUE := pqueue.h

$	EXHEADER_TS := ts.h

$	EXHEADER_JPAKE := jpake.h

$	LIBS := LIBCRYPTO

$

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

engines/makeengines.com

+13 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ $! Set the names of the engines we want to build 
$!

$ ENGINES = "," + P6

$ IF ENGINES .EQS. "," THEN -

	ENGINES = ",4758cca,aep,atalla,cswift,chil,nuron,sureware,ubsec,padlock"

	ENGINES = ",4758cca,aep,atalla,cswift,chil,nuron,sureware,ubsec,padlock,ccgost"

$!

$! Set the default TCP/IP library to link against if needed

$!
@@ -87,6 +87,12 @@ $ ENGINE_chil = "e_chil" 
$ ENGINE_nuron = "e_nuron"

$ ENGINE_sureware = "e_sureware"

$ ENGINE_ubsec = "e_ubsec"

$

$ ENGINE_ccgost_SUBDIR = "ccgost"

$ ENGINE_ccgost = "e_gost_err,gost2001_keyx,gost2001,gost89,gost94_keyx,"+ -

		  "gost_ameth,gost_asn1,gost_crypt,gost_ctl,gost_eng,"+ -

		  "gosthash,gost_keywrap,gost_md,gost_params,gost_pmeth,"+ -

		  "gost_sign"

$!

$! Define which programs need to be linked with a TCP/IP library

$!
@@ -149,7 +155,12 @@ $ IF FILE_NAME .EQS. "" THEN GOTO FILE_NEXT 
$!

$! Set up the source and object reference

$!

$ IF F$TYPE('LIB_ENGINE'_SUBDIR) .EQS. ""

$ THEN

$     SOURCE_FILE = F$PARSE(FILE_NAME,"SYS$DISK:[].C",,,"SYNTAX_ONLY")

$ ELSE

$     SOURCE_FILE = F$PARSE(FILE_NAME,"SYS$DISK:[."+'LIB_ENGINE'_SUBDIR+"].C",,,"SYNTAX_ONLY")

$ ENDIF

$ OBJECT_FILE = OBJ_DIR + F$PARSE(FILE_NAME,,,"NAME","SYNTAX_ONLY") + ".OBJ"

$!

$! If we get some problem, we just go on trying to build the next module.

makevms.com

+5 −4
Original line number Diff line number Diff line
@@ -429,11 +429,11 @@ $! 
$ SDIRS := ,-

   OBJECTS,-

   MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-

   DES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-

   BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,AES,-

   DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-

   BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,-

   BUFFER,BIO,STACK,LHASH,RAND,ERR,-

   EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,-

   STORE,CMS,PQUEUE,TS

   STORE,CMS,PQUEUE,TS,JPAKE

$ 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
@@ -445,6 +445,7 @@ $ EXHEADER_HMAC := hmac.h 
$ EXHEADER_RIPEMD := ripemd.h

$ EXHEADER_WHRLPOOL := whrlpool.h

$ EXHEADER_DES := des.h,des_old.h

$ EXHEADER_AES := aes.h

$ EXHEADER_RC2 := rc2.h

$ EXHEADER_RC4 := rc4.h

$ EXHEADER_RC5 := rc5.h
@@ -462,7 +463,6 @@ $ EXHEADER_DH := dh.h 
$ EXHEADER_ECDH := ecdh.h

$ EXHEADER_DSO := dso.h

$ EXHEADER_ENGINE := engine.h

$ EXHEADER_AES := aes.h

$ EXHEADER_BUFFER := buffer.h

$ EXHEADER_BIO := bio.h

$ EXHEADER_STACK := stack.h,safestack.h
@@ -487,6 +487,7 @@ $ EXHEADER_STORE := store.h 
$ EXHEADER_CMS := cms.h

$ EXHEADER_PQUEUE := pqueue.h

$ EXHEADER_TS := ts.h

$ EXHEADER_JPAKE := jpake.h

$

$ I = 0

$ LOOP_SDIRS:

test/Makefile

+8 −7
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ RSATEST= rsa_test 
ENGINETEST=	enginetest

EVPTEST=	evp_test

IGETEST=	igetest

JPAKETEST=	jpaketest



TESTS=		alltests
@@ -70,7 +71,7 @@ EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST) 
	$(MDC2TEST)$(EXE_EXT) $(RMDTEST)$(EXE_EXT) \

	$(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \

	$(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \

	$(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) jpaketest$(EXE_EXT)

	$(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT)



# $(METHTEST)$(EXE_EXT)
@@ -82,7 +83,7 @@ OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \ 
	$(MDC2TEST).o $(RMDTEST).o \

	$(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \

	$(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o $(RSATEST).o \

	$(EVPTEST).o $(IGETEST).o jpaketest.o

	$(EVPTEST).o $(IGETEST).o $(JPAKETEST).o

SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \

	$(MD2TEST).c  $(MD4TEST).c $(MD5TEST).c \

	$(HMACTEST).c $(WPTEST).c \
@@ -90,7 +91,7 @@ SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \ 
	$(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \

	$(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \

	$(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c $(RSATEST).c \

	$(EVPTEST).c $(IGETEST).c jpaketest.c

	$(EVPTEST).c $(IGETEST).c $(JPAKETEST).c



EXHEADER= 

HEADER=	$(EXHEADER)
@@ -299,9 +300,9 @@ test_ige: $(IGETEST)$(EXE_EXT) 
	@echo "Test IGE mode"

	../util/shlib_wrap.sh ./$(IGETEST)



test_jpake: jpaketest$(EXE_EXT)

test_jpake: $(JPAKETEST)$(EXE_EXT)

	@echo "Test JPAKE"

	../util/shlib_wrap.sh ./jpaketest

	../util/shlib_wrap.sh ./$(JPAKETEST)



lint:

	lint -DLINT $(INCLUDES) $(SRC)>fluff
@@ -433,8 +434,8 @@ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) 
$(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)

	@target=$(IGETEST); $(BUILD_CMD)



jpaketest$(EXE_EXT): jpaketest.o $(DLIBCRYPTO)

	@target=jpaketest; $(BUILD_CMD)

$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)

	@target=$(JPAKETEST); $(BUILD_CMD)



#$(AESTEST).o: $(AESTEST).c

#	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c