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.

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 3537627fa287a5c21d5315bdf55f3ea4dbff583a..1423cac288d2434f5e850442f3446009f273b0d0 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -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,11 +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,o_fips.c,o_init,fips_ers"
+$! 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,o_fips,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_MD4 = "md4_dgst,md4_one"
 $ LIB_MD5 = "md5_dgst,md5_one"
@@ -224,14 +231,16 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ -
        "des_enc,fcrypt_b,"+ -
        "fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ -
        "ede_cbcm_enc,des_old,des_old2,read2pwd"
+$ LIB_AES = "aes_misc,aes_ecb,aes_cfb,aes_ofb,aes_ctr,aes_ige,aes_wrap,"+ -
+       "aes_core,aes_cbc"
 $ 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_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,cmll_utl"
+$ LIB_CAMELLIA = "cmll_ecb,cmll_ofb,cmll_cfb,cmll_ctr,"+ -
+       "cmll_utl,camellia,cmll_misc,cmll_cbc"
 $ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb"
 $ LIB_MODES = "cbc128,ctr128,cts128,cfb128,ofb128,gcm128,"+ -
        "ccm128,xts128,wrap128"
@@ -256,7 +265,7 @@ $ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,"+ -
        "dsa_err,dsa_ossl,dsa_depr,dsa_ameth,dsa_pmeth,dsa_prn"
 $ LIB_ECDSA = "ecs_lib,ecs_asn1,ecs_ossl,ecs_sign,ecs_vrf,ecs_err"
 $ LIB_DH = "dh_asn1,dh_gen,dh_key,dh_lib,dh_check,dh_err,dh_depr,"+ -
-       "dh_ameth,dh_pmeth,dh_prn,dh_rfc5114,dh_kdf"
+       "dh_ameth,dh_pmeth,dh_prn,dh_rfc5114,dh_kdf"
 $ LIB_ECDH = "ech_lib,ech_ossl,ech_key,ech_err,ech_kdf"
 $ LIB_DSO = "dso_dl,dso_dlfcn,dso_err,dso_lib,dso_null,"+ -
        "dso_openssl,dso_win32,dso_vms,dso_beos"
@@ -264,24 +273,21 @@ $ 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_rsax,eng_rdrand"
-$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr,"+ -
-       "aes_ige,aes_wrap"
+       "eng_openssl,eng_cnf,eng_dyn,eng_cryptodev,"+ -
+       "eng_rdrand"
 $ LIB_BUFFER = "buffer,buf_str,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,"+ -
-       "bss_dgram" !!! ","+ -
-$!     "bf_lbuf"
+       "b_sock,bss_acpt,bf_nbio,bss_log,bss_bio,"+ -
+       "bss_dgram,"+ -
+       "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,evp_cnf,"+ -
        "e_des,e_bf,e_idea,e_des3,e_camellia,"+ -
        "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_SRP = "srp_lib,srp_vfy"
 $ 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
 $!

diff --git a/crypto/install-crypto.com b/crypto/install-crypto.com
index 85b3d583cf6fbf1115c747fc77cc2b47ba6806af..af1d75b526f031aa50d5b6b85d0979bec0bdd3a2 100755 (executable)
--- a/crypto/install-crypto.com
+++ b/crypto/install-crypto.com
@@ -75,8 +75,8 @@ $!
 $ 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, -

diff --git a/engines/makeengines.com b/engines/makeengines.com
index 64dc90f2f5d104d8e4e74666c243b4e51120a650..fd8bca978b806ffbdf9f52d2bb31a27c3a5a664e 100644 (file)
--- a/engines/makeengines.com
+++ b/engines/makeengines.com
@@ -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"

diff --git a/makevms.com b/makevms.com
index 688a2e0146e7fb3cf0b361b4f6fb2a0586f3dec1..f1183ef1ea27da9e381a426b606e924db8fc2e57 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -274,6 +274,7 @@ $ CONFIG_LOGICALS := AES,-
                     GMP,-
                     GOST,-
                     HASH_COMP,-
+                    HEARTBEATS,-
                     HMAC,-
                     IDEA,-
                     JPAKE,-
@@ -283,6 +284,7 @@ $ CONFIG_LOGICALS := AES,-
                     MD4,-
                     MD5,-
                     MDC2,-
+                    NEXTPROTONEG,-
                     OCSP,-
                     PSK,-
                     RC2,-
@@ -291,6 +293,7 @@ $ CONFIG_LOGICALS := AES,-
                     RFC3779,-
                     RIPEMD,-
                     RSA,-
+                    SCTP,-
                     SEED,-
                     SHA,-
                     SHA0,-
@@ -301,6 +304,7 @@ $ CONFIG_LOGICALS := AES,-
                     SRP,-
                     SSL2,-
                     SSL_INTERN,-
+                    SSL_TRACE,-
                     STACK,-
                     STATIC_ENGINE,-
                     STDIO,-
@@ -340,7 +344,13 @@ $ CONFIG_DISABLE_RULES := RIJNDAEL/AES;-
                          DH/GOST;-
                          /STATIC_ENGINE;-
                          /KRB5;-
-                         /EC_NISTP_64_GCC_128
+                         /EC_NISTP_64_GCC_128;-
+                         /GMP;-
+                         /MD2;-
+                         /RC5;-
+                         /RFC3779;-
+                         /SCTP;-
+                         /SSL_TRACE
 $ CONFIG_ENABLE_RULES := ZLIB_DYNAMIC/ZLIB;-
                         /THREADS
 $
@@ -707,8 +717,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, -
@@ -819,9 +829,10 @@ $ @CRYPTO-LIB LIBRARY 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" -
    "''ISSEVEN'" "''BUILDPART'" "''POINTER_SIZE'" "''ZLIB'"
 $!
 $! 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.
 $!