Synchronise with Unix build

diff --git a/apps/makeapps.com b/apps/makeapps.com
index 0580a1f401c9c1ecf86621018769ef3feb84d675..826ab5bec63f7e426c5d30ce0a18dfed72474bf4 100644 (file)
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -142,7 +142,7 @@ $ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+-
              "RSA;RSAUTL;DSA;DSAPARAM;EC;ECPARAM;"+-
              "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+-
              "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+-
-             "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND;ENGINE;OCSP;PRIME"
+             "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;CMS;RAND;ENGINE;OCSP;PRIME"
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
      TCPIP_PROGRAMS = ",OPENSSL,"

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 44a99af04fe66d3cb1a5a34aedcbcea271be10fc..2857aec4f1eb366e065c6a5544c3b6b7abd0a53c 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,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
                  "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,"+ -
-                 "STORE,PQUEUE"
+                 "STORE,CMS,PQUEUE"
 $!
 $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
@@ -282,6 +282,8 @@ $!
 $! Setup exceptional compilations
 $!
 $ ! Add definitions for no threads on OpenVMS 7.1 and higher
+$ 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"
 $ COMPILEWITH_CC3 = ",bss_rtcp,"
 $ ! Disable the DOLLARID warning
 $ COMPILEWITH_CC4 = ",a_utctm,bss_log,o_time,o_dir"

diff --git a/crypto/install.com b/crypto/install.com
index 44390e0f94e70e0967e4b90542353f474bcebf4d..58a4fecdaa4bd1390e0d19a811cc6832ae66c3ac 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
+                STORE,CMS,PQUEUE
 $      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_KRB5 := krb5_asn.h
 $!     EXHEADER_STORE := store.h,str_compat.h
 $      EXHEADER_STORE := store.h
 $      EXHEADER_PQUEUE := pqueue.h,pq_compat.h
+$      EXHEADER_CMS := cms.h
 $      LIBS := LIBCRYPTO
 $
 $      VEXE_DIR := [-.VAX.EXE.CRYPTO]

diff --git a/makevms.com b/makevms.com
index 2b2173bf4a10fa3357834b3b3babc6bc77827dc3..4f70308082bf87ee6493a73d2232cc248b39bfe9 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
+   STORE,CMS,PQUEUE
 $ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h,-
                ossl_typ.h
 $ EXHEADER_OBJECTS := objects.h,obj_mac.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
 $
 $ I = 0