generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Richard Levitte 2014-08-06 04:37:27 +02:00 committed by Richard Levitte
parent f13a149088
commit 7a3809fd97
5 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
crypto/crypto-lib.com
View File

@ -111,8 +111,8 @@ $ ET_WHIRLPOOL = "WHRLPOOL"
$ IF ARCH .EQS. "VAX" THEN ET_WHIRLPOOL = "" $ IF ARCH .EQS. "VAX" THEN ET_WHIRLPOOL = ""
$ ENCRYPT_TYPES = "Basic,"+ - $ ENCRYPT_TYPES = "Basic,"+ -
"OBJECTS,"+ - "OBJECTS,"+ -
"MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ET_WHIRLPOOL+","+ - "MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ET_WHIRLPOOL+","+ -
"DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,MODES,"+ - "DES,AES,RC2,RC4,IDEA,BF,CAST,CAMELLIA,SEED,MODES,"+ -
"BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,"+ - "BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,"+ -
"BUFFER,BIO,STACK,LHASH,RAND,ERR,"+ - "BUFFER,BIO,STACK,LHASH,RAND,ERR,"+ -
"EVP,EVP_2,EVP_3,ASN1,ASN1_2,PEM,X509,X509V3,"+ - "EVP,EVP_2,EVP_3,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
@ -204,11 +204,18 @@ $ GOSUB CHECK_OPT_FILE
$! $!
$! Define The Different Encryption "library" Strings. $! Define The Different Encryption "library" Strings.
$! $!
$ APPS_DES = "DES/DES,CBC3_ENC" $!!! Test apps disabled, as they aren't supported at all,
$ APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE" $!!! 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,"+ - $! These variables are ordered as the SDIRS variable from the top Makefile.org
"ebcdic,uid,o_time,o_str,o_dir,o_fips.c,o_init,fips_ers" $! 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,o_fips.c,o_init,fips_ers,mem_clr"
$ LIB_OBJECTS = "o_names,obj_dat,obj_lib,obj_err,obj_xref"
$ LIB_MD2 = "md2_dgst,md2_one" $ LIB_MD2 = "md2_dgst,md2_one"
$ LIB_MD4 = "md4_dgst,md4_one" $ LIB_MD4 = "md4_dgst,md4_one"
$ LIB_MD5 = "md5_dgst,md5_one" $ LIB_MD5 = "md5_dgst,md5_one"
@ -225,13 +232,13 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ -
"fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ - "fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ -
"ede_cbcm_enc,des_old,des_old2,read2pwd" "ede_cbcm_enc,des_old,des_old2,read2pwd"
$ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64" $ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64"
$ LIB_RC4 = "rc4_skey,rc4_enc,rc4_utl" $ LIB_RC4 = "rc4_enc,rc4_skey,rc4_utl"
$ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64" $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64"
$ LIB_IDEA = "i_cbc,i_cfb64,i_ofb64,i_ecb,i_skey" $ 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_BF = "bf_skey,bf_ecb,bf_enc,bf_cfb64,bf_ofb64"
$ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64" $ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64"
$ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ - $ LIB_CAMELLIA = "cmll_ecb,cmll_ofb,cmll_cfb,cmll_ctr,cmll_utl,"+ -
"cmll_cfb,cmll_ctr,cmll_utl" "camellia,cmll_misc,cmll_cbc"
$ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb" $ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb"
$ LIB_MODES = "cbc128,ctr128,cts128,cfb128,ofb128,gcm128,"+ - $ LIB_MODES = "cbc128,ctr128,cts128,cfb128,ofb128,gcm128,"+ -
"ccm128,xts128" "ccm128,xts128"
@ -264,24 +271,23 @@ $ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ -
"eng_table,eng_pkey,eng_fat,eng_all,"+ - "eng_table,eng_pkey,eng_fat,eng_all,"+ -
"tb_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ - "tb_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ -
"tb_cipher,tb_digest,tb_pkmeth,tb_asnmth,"+ - "tb_cipher,tb_digest,tb_pkmeth,tb_asnmth,"+ -
"eng_openssl,eng_dyn,eng_cnf,eng_cryptodev,"+ - "eng_openssl,eng_cnf,eng_dyn,eng_cryptodev,"+ -
"eng_rsax,eng_rdrand" "eng_rsax,eng_rdrand"
$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr,"+ - $ LIB_AES = "aes_misc,aes_ecb,aes_cfb,aes_ofb,aes_ctr,aes_ige,aes_wrap,"+ -
"aes_ige,aes_wrap" "aes_core,aes_cbc"
$ LIB_BUFFER = "buffer,buf_str,buf_err" $ LIB_BUFFER = "buffer,buf_str,buf_err"
$ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ - $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
"bss_mem,bss_null,bss_fd,"+ - "bss_mem,bss_null,bss_fd,"+ -
"bss_file,bss_sock,bss_conn,"+ - "bss_file,bss_sock,bss_conn,"+ -
"bf_null,bf_buff,b_print,b_dump,"+ - "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,"+ - "bss_dgram,"+ -
"bf_lbuf" "bf_lbuf,bss_rtcp" ! The last two are VMS specific
$ LIB_STACK = "stack" $ LIB_STACK = "stack"
$ LIB_LHASH = "lhash,lh_stats" $ LIB_LHASH = "lhash,lh_stats"
$ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd,"+ - $ 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_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,evp_cnf,"+ - $ LIB_EVP = "encode,digest,evp_enc,evp_key,evp_acnf,evp_cnf,"+ -
"e_des,e_bf,e_idea,e_des3,e_camellia,"+ - "e_des,e_bf,e_idea,e_des3,e_camellia,"+ -
"e_rc4,e_aes,names,e_seed,"+ - "e_rc4,e_aes,names,e_seed,"+ -
@ -345,7 +351,7 @@ $ LIB_TS = "ts_err,ts_req_utils,ts_req_print,ts_rsp_utils,ts_rsp_print,"+ -
$ LIB_JPAKE = "jpake,jpake_err" $ LIB_JPAKE = "jpake,jpake_err"
$ LIB_SRP = "srp_lib,srp_vfy" $ LIB_SRP = "srp_lib,srp_vfy"
$ LIB_STORE = "str_err,str_lib,str_meth,str_mem" $ LIB_STORE = "str_err,str_lib,str_meth,str_mem"
$ LIB_CMAC = "cmac,cm_ameth.c,cm_pmeth" $ LIB_CMAC = "cmac,cm_ameth,cm_pmeth"
$! $!
$! Setup exceptional compilations $! Setup exceptional compilations
$! $!

9
crypto/install-crypto.com
View File

@ -75,13 +75,13 @@ $!
$ sdirs := , - $ sdirs := , -
'archd', - 'archd', -
objects, - objects, -
md2, md4, md5, sha, mdc2, hmac, ripemd, whrlpool, - md4, md5, sha, mdc2, hmac, ripemd, whrlpool, -
des, aes, rc2, rc4, rc5, idea, bf, cast, camellia, seed, - des, aes, rc2, rc4, idea, bf, cast, camellia, seed, -
bn, ec, rsa, dsa, ecdsa, dh, ecdh, dso, engine, - bn, ec, rsa, dsa, ecdsa, dh, ecdh, dso, engine, -
buffer, bio, stack, lhash, rand, err, - buffer, bio, stack, lhash, rand, err, -
evp, asn1, pem, x509, x509v3, conf, txt_db, pkcs7, pkcs12, comp, ocsp, - evp, asn1, pem, x509, x509v3, conf, txt_db, pkcs7, pkcs12, comp, ocsp, -
ui, krb5, - 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_ := crypto.h, opensslv.h, ebcdic.h, symhacks.h, ossl_typ.h
$ exheader_'archd' := opensslconf.h $ exheader_'archd' := opensslconf.h
@ -139,6 +139,9 @@ $ exheader_cms := cms.h
$ exheader_pqueue := pqueue.h $ exheader_pqueue := pqueue.h
$ exheader_ts := ts.h $ exheader_ts := ts.h
$ exheader_jpake := jpake.h $ exheader_jpake := jpake.h
$ exheader_srp := srp.h
$ exheader_store := store.h
$ exheader_cmac := cmac.h
$ libs := ssl_libcrypto $ libs := ssl_libcrypto
$! $!
$ exe_dir := [-.'archd'.exe.crypto] $ exe_dir := [-.'archd'.exe.crypto]

2
engines/makeengines.com
View File

@ -155,7 +155,7 @@ $ ENGINE_ = "engine_vector.mar"
$ TV_OBJ_NAME = OBJ_DIR + F$PARSE(ENGINE_,,,"NAME","SYNTAX_ONLY") + ".OBJ" $ TV_OBJ_NAME = OBJ_DIR + F$PARSE(ENGINE_,,,"NAME","SYNTAX_ONLY") + ".OBJ"
$ TV_OBJ = ",''TV_OBJ_NAME'" $ TV_OBJ = ",''TV_OBJ_NAME'"
$ ENDIF $ ENDIF
$ ENGINE_4758CCA = "e_4758cca" $ ENGINE_4758cca = "e_4758cca"
$ ENGINE_aep = "e_aep" $ ENGINE_aep = "e_aep"
$ ENGINE_atalla = "e_atalla" $ ENGINE_atalla = "e_atalla"
$ ENGINE_cswift = "e_cswift" $ ENGINE_cswift = "e_cswift"

17
makevms.com
View File

@ -283,6 +283,7 @@ $ CONFIG_LOGICALS := AES,-
MD4,- MD4,-
MD5,- MD5,-
MDC2,- MDC2,-
NEXTPROTONEG,-
OCSP,- OCSP,-
PSK,- PSK,-
RC2,- RC2,-
@ -340,7 +341,12 @@ $ CONFIG_DISABLE_RULES := RIJNDAEL/AES;-
DH/GOST;- DH/GOST;-
/STATIC_ENGINE;- /STATIC_ENGINE;-
/KRB5;- /KRB5;-
/EC_NISTP_64_GCC_128 /EC_NISTP_64_GCC_128;-
/GMP;-
/MD2;-
/RC5;-
/RFC3779;-
/SCTP
$ CONFIG_ENABLE_RULES := ZLIB_DYNAMIC/ZLIB;- $ CONFIG_ENABLE_RULES := ZLIB_DYNAMIC/ZLIB;-
/THREADS /THREADS
$ $
@ -706,8 +712,8 @@ $!
$ SDIRS := , - $ SDIRS := , -
'ARCHD', - 'ARCHD', -
OBJECTS, - OBJECTS, -
MD2, MD4, MD5, SHA, MDC2, HMAC, RIPEMD, WHRLPOOL, - MD4, MD5, SHA, MDC2, HMAC, RIPEMD, WHRLPOOL, -
DES, AES, RC2, RC4, RC5, IDEA, BF, CAST, CAMELLIA, SEED, MODES, - DES, AES, RC2, RC4, IDEA, BF, CAST, CAMELLIA, SEED, MODES, -
BN, EC, RSA, DSA, ECDSA, DH, ECDH, DSO, ENGINE, - BN, EC, RSA, DSA, ECDSA, DH, ECDH, DSO, ENGINE, -
BUFFER, BIO, STACK, LHASH, RAND, ERR, - BUFFER, BIO, STACK, LHASH, RAND, ERR, -
EVP, ASN1, PEM, X509, X509V3, CONF, TXT_DB, PKCS7, PKCS12, - EVP, ASN1, PEM, X509, X509V3, CONF, TXT_DB, PKCS7, PKCS12, -
@ -819,8 +825,9 @@ $ @CRYPTO-LIB LIBRARY 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" -
$! $!
$! Build The [.xxx.EXE.CRYPTO]*.EXE Test Applications. $! Build The [.xxx.EXE.CRYPTO]*.EXE Test Applications.
$! $!
$ @CRYPTO-LIB APPS 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" - $!!! DISABLED, as these test programs lack any support
"''ISSEVEN'" "''BUILDPART'" "''POINTER_SIZE'" "''ZLIB'" $!!!$ @CRYPTO-LIB APPS 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" -
$!!! "''ISSEVEN'" "''BUILDPART'" "''POINTER_SIZE'" "''ZLIB'"
$! $!
$! Go Back To The Main Directory. $! Go Back To The Main Directory.
$! $!