Commit cdad6ad0 authored by Richard Levitte's avatar Richard Levitte Committed by Richard Levitte
Browse files

Adjust VMS build to Unix build. Most of all, make it so the disabled 


algorithms MD2 and RC5 don't get built.
Also, disable building the test apps in crypto/des and crypto/pkcs7, as
they have no support at all.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>

Conflicts:
	crypto/crypto-lib.com
	makevms.com
	ssl/ssl-lib.com
parent 4eca4cfb

crypto/crypto-lib.com

+22 −14
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ $ ET_WHIRLPOOL = "WHRLPOOL" 
$ IF ARCH .EQS. "VAX" THEN ET_WHIRLPOOL = ""

$ ENCRYPT_TYPES = "Basic,"+ -

		  "OBJECTS,"+ -

		  "MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ET_WHIRLPOOL+","+ -

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

		  "MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ET_WHIRLPOOL+","+ -

		  "DES,AES,RC2,RC4,IDEA,BF,CAST,CAMELLIA,SEED,MODES,"+ -

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

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

		  "EVP,EVP_2,EVP_3,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
@@ -204,10 +204,18 @@ $ GOSUB CHECK_OPT_FILE 
$!

$! Define The Different Encryption "library" Strings.

$!

$ APPS_DES = "DES/DES,CBC3_ENC"

$ APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE"

$!!! Test apps disabled, as they aren't supported at all,

$!!! not even in the unix build

$!!! APPS_DES = "DES/DES,CBC3_ENC"

$!!! APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE"

$

$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,cpt_err,ebcdic,uid,o_time,o_str,o_dir"

$! These variables are ordered as the SDIRS variable from the top Makefile.org

$! The contents of these variables are copied from the LIBOBJ variable in the

$! corresponding Makefile from each corresponding subdirectory, with .o stripped

$! and spaces replaced with commas.

$ LIB_ = "cryptlib,mem,mem_dbg,cversion,ex_data,cpt_err,ebcdic,"+ -

	"uid,o_time,o_str,o_dir,mem_clr"

$ LIB_OBJECTS = "o_names,obj_dat,obj_lib,obj_err,obj_xref"

$ LIB_MD2 = "md2_dgst,md2_one"

$ LIB_MD4 = "md4_dgst,md4_one"

$ LIB_MD5 = "md5_dgst,md5_one"
@@ -224,13 +232,13 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ - 
	"fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ -

	"ede_cbcm_enc,des_old,des_old2,read2pwd"

$ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64"

$ LIB_RC4 = "rc4_skey,rc4_enc"

$ LIB_RC4 = "rc4_enc,rc4_skey"

$ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64"

$ LIB_IDEA = "i_cbc,i_cfb64,i_ofb64,i_ecb,i_skey"

$ LIB_BF = "bf_skey,bf_ecb,bf_enc,bf_cfb64,bf_ofb64"

$ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64"

$ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ -

	"cmll_cfb,cmll_ctr"

$ LIB_CAMELLIA = "cmll_ecb,cmll_ofb,cmll_cfb,cmll_ctr,"+ -

	"camellia,cmll_misc,cmll_cbc"

$ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb"

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

$ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"
@@ -261,22 +269,21 @@ $ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ - 
	"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"

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

	"aes_ige,aes_wrap"

$ LIB_AES = "aes_misc,aes_ecb,aes_cfb,aes_ofb,aes_ctr,aes_ige,aes_wrap,"+ -

	"aes_core,aes_cbc"

$ LIB_BUFFER = "buffer,buf_err"

$ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -

	"bss_mem,bss_null,bss_fd,"+ -

	"bss_file,bss_sock,bss_conn,"+ -

	"bf_null,bf_buff,b_print,b_dump,"+ -

	"b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio,bss_log,"+ -

	"b_sock,bss_acpt,bf_nbio,bss_log,bss_bio,"+ -

	"bss_dgram,"+ -

	"bf_lbuf"

	"bf_lbuf,bss_rtcp" ! The last two are VMS specific

$ LIB_STACK = "stack"

$ LIB_LHASH = "lhash,lh_stats"

$ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd,"+ -

	"rand_vms"

	"rand_vms" ! The last one is VMS specific

$ LIB_ERR = "err,err_all,err_prn"

$ LIB_OBJECTS = "o_names,obj_dat,obj_lib,obj_err,obj_xref"

$ LIB_EVP = "encode,digest,evp_enc,evp_key,evp_acnf,"+ -

	"e_des,e_bf,e_idea,e_des3,e_camellia,"+ -

	"e_rc4,e_aes,names,e_seed,"+ -
@@ -337,6 +344,7 @@ $ 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"

$ LIB_STORE = "str_err,str_lib,str_meth,str_mem"

$!

$! Setup exceptional compilations

$!

crypto/install-crypto.com

+6 −3
Original line number Diff line number Diff line
@@ -75,13 +75,13 @@ $! 
$ sdirs := , -

   'archd', -

   objects, -

   md2, md4, md5, sha, mdc2, hmac, ripemd, whrlpool, -

   des, aes, rc2, rc4, rc5, idea, bf, cast, camellia, seed, -

   md4, md5, sha, mdc2, hmac, ripemd, whrlpool, -

   des, aes, rc2, rc4, 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, jpake

   cms, pqueue, ts, jpake, srp, store, cmac

$!

$ exheader_ := crypto.h, opensslv.h, ebcdic.h, symhacks.h, ossl_typ.h

$ exheader_'archd' := opensslconf.h
@@ -139,6 +139,9 @@ $ exheader_cms := cms.h 
$ exheader_pqueue := pqueue.h

$ exheader_ts := ts.h

$ exheader_jpake := jpake.h

$ exheader_srp := srp.h

$ exheader_store := store.h

$ exheader_cmac := cmac.h

$ libs := ssl_libcrypto

$!

$ exe_dir := [-.'archd'.exe.crypto]

engines/makeengines.com

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ $ ENGINE_ = "engine_vector.mar" 
$   TV_OBJ_NAME = OBJ_DIR + F$PARSE(ENGINE_,,,"NAME","SYNTAX_ONLY") + ".OBJ"

$   TV_OBJ = ",''TV_OBJ_NAME'"

$ ENDIF

$ ENGINE_4758CCA = "e_4758cca"

$ ENGINE_4758cca = "e_4758cca"

$ ENGINE_aep = "e_aep"

$ ENGINE_atalla = "e_atalla"

$ ENGINE_cswift = "e_cswift"

makevms.com

+11 −5
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ $ CONFIG_LOGICALS := AES,- 
		     MD4,-

		     MD5,-

		     MDC2,-

		     NEXTPROTONEG,-

		     OCSP,-

		     PSK,-

		     RC2,-
@@ -335,7 +336,11 @@ $ CONFIG_DISABLE_RULES := RIJNDAEL/AES;- 
			  DSA/GOST;-

			  DH/GOST;-

			  /STATIC_ENGINE;-

			  /KRB5

			  /KRB5;-

			  /GMP;-

			  /MD2;-

			  /RC5;-

			  /RFC3779

$ CONFIG_ENABLE_RULES := ZLIB_DYNAMIC/ZLIB;-

			 /THREADS

$
@@ -698,8 +703,8 @@ $! 
$ SDIRS := , -

   'ARCHD', -

   OBJECTS, -

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

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

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

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

   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, -
@@ -809,8 +814,9 @@ $ @CRYPTO-LIB LIBRARY 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" - 
$!

$! Build The [.xxx.EXE.CRYPTO]*.EXE Test Applications.

$!  

$ @CRYPTO-LIB APPS 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" -

   "''ISSEVEN'" "''BUILDPART'" "''POINTER_SIZE'" "''ZLIB'"

$!!! DISABLED, as these test programs lack any support

$!!!$ @CRYPTO-LIB APPS 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" -

$!!!   "''ISSEVEN'" "''BUILDPART'" "''POINTER_SIZE'" "''ZLIB'"

$!

$! Go Back To The Main Directory.

$!

ssl/ssl-lib.com

+5 −5

File changed.

Contains only whitespace changes.