Synchronise with Unix build

diff --git a/apps/makeapps.com b/apps/makeapps.com
index 7657827ef7257f4bc4ccc4e96fe94d5a416b6a6e..2e90443fbc346da31f2544469b2a6846c9aae1f7 100644 (file)
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -139,7 +139,7 @@ $ LIB_OPENSSL = "VERIFY,ASN1PARS,REQ,DGST,DH,DHPARAM,ENC,PASSWD,GENDH,ERRSTR,"+-
                "X509,GENRSA,GENDSA,GENPKEY,S_SERVER,S_CLIENT,SPEED,"+-
                "S_TIME,APPS,S_CB,S_SOCKET,APP_RAND,VERSION,SESS_ID,"+-
                "CIPHERS,NSEQ,PKCS12,PKCS8,PKEY,PKEYPARAM,PKEYUTL,"+ -
-               "SPKAC,SMIME,RAND,ENGINE,OCSP,PRIME,TS"
+               "SPKAC,SMIME,CMS,RAND,ENGINE,OCSP,PRIME,TS"
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
      TCPIP_PROGRAMS = ",OPENSSL,"

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 2ae171942aa582109a23faf39f3608670fd89207..d29185eed610e37eb8baac1409190050e89e4b8d 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -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,PQUEUE,TS"
+                 "STORE,CMS,PQUEUE,TS"
 $!
 $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
@@ -282,6 +282,8 @@ $ LIB_UI_COMPAT = ",ui_compat"
 $ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT
 $ LIB_KRB5 = "krb5_asn"
 $ LIB_STORE = "str_err,str_lib,str_meth,str_mem"
+$ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -
+       "cms_sd,cms_dd,cms_cd,cms_env,cms_enc,cms_ess"
 $ 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,"+ -

diff --git a/crypto/install.com b/crypto/install.com
index da4ab8569c0454e820782029f8beb61de81a1c60..c7f017d55aec5358e0d47aa9baf01c82b5c678d7 100644 (file)
--- a/crypto/install.com
+++ b/crypto/install.com
@@ -40,7 +40,7 @@ $     SDIRS := ,-
                 BUFFER,BIO,STACK,LHASH,RAND,ERR,-
                 EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,-
                 UI,KRB5,-
-                STORE,PQUEUE,TS
+                STORE,CMS,PQUEUE,TS
 $      EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,-
                symhacks.h,ossl_typ.h
 $      EXHEADER_OBJECTS := objects.h,obj_mac.h
@@ -92,6 +92,7 @@ $     EXHEADER_UI := ui.h,ui_compat.h
 $      EXHEADER_KRB5 := krb5_asn.h
 $!     EXHEADER_STORE := store.h,str_compat.h
 $      EXHEADER_STORE := store.h
+$      EXHEADER_CMS := cms.h
 $      EXHEADER_PQUEUE := pqueue.h,pq_compat.h
 $      EXHEADER_TS := ts.h
 $      LIBS := LIBCRYPTO

diff --git a/makevms.com b/makevms.com
index 19deed1e13f6acc335b8cc0f756183bf99a495b7..3aed697b6d84129193ebd96995a3f0e10f13b1e8 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -433,7 +433,7 @@ $ SDIRS := ,-
    BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,AES,-
    BUFFER,BIO,STACK,LHASH,RAND,ERR,-
    EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,-
-   STORE,PQUEUE,TS
+   STORE,CMS,PQUEUE,TS
 $ 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
@@ -484,6 +484,7 @@ $ EXHEADER_UI := ui.h,ui_compat.h
 $ EXHEADER_KRB5 := krb5_asn.h
 $!EXHEADER_STORE := store.h,str_compat.h
 $ EXHEADER_STORE := store.h
+$ EXHEADER_CMS := cms.h
 $ EXHEADER_PQUEUE := pqueue.h,pq_compat.h
 $ EXHEADER_TS := ts.h
 $