Keep synchronised with the Unix build

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 46e1796b70fc59ebcece333c45666632dd7b9012..6a5251149fefd97a03b42a356111a4e204ebb85d 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -78,7 +78,7 @@ $!
 $ ENCRYPT_TYPES = "Basic,"+ -
                  "OBJECTS,"+ -
                  "MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,"+ -
-                 "DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,"+ -
+                 "DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,"+ -
                  "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,"+ -
@@ -183,6 +183,8 @@ $ 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_BN_ASM = "[.asm]vms.mar,vms-helper"
 $ IF F$TRNLNM("OPENSSL_NO_ASM").OR.ARCH.EQS."AXP" THEN LIB_BN_ASM = "bn_asm"
 $ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_ctx,bn_mul,bn_mod,"+ -

diff --git a/crypto/install.com b/crypto/install.com
index 6256abf17ddf5a9eb7c7b3e4ff150934a65eea8f..8aa387df2ba913d1c35c9fefbaf93a8d70268d6b 100644 (file)
--- a/crypto/install.com
+++ b/crypto/install.com
@@ -35,7 +35,7 @@ $
 $      SDIRS := ,-
                 OBJECTS,-
                 MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-
-                DES,RC2,RC4,RC5,IDEA,BF,CAST,-
+                DES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,-
                 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,-
@@ -59,6 +59,7 @@ $     EXHEADER_RC5 := rc5.h
 $      EXHEADER_IDEA := idea.h
 $      EXHEADER_BF := blowfish.h
 $      EXHEADER_CAST := cast.h
+$      EXHEADER_CAMELLIA := camellia.h
 $      EXHEADER_BN := bn.h
 $      EXHEADER_EC := ec.h
 $      EXHEADER_RSA := rsa.h

diff --git a/makevms.com b/makevms.com
index f9281f7331374c32a7aa029499cd64f0ff672b3e..9335750f05348bf450d55fd091979d865dcc2bf5 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -183,7 +183,7 @@ $ WRITE H_FILE "# define OPENSSL_SYS_VMS"
 $ WRITE H_FILE "#endif"
 $ CONFIG_LOGICALS := NO_ASM,NO_RSA,NO_DSA,NO_DH,NO_MD2,NO_MD5,NO_RIPEMD,WHRLPOOL,-
        NO_SHA,NO_SHA0,NO_SHA1,NO_DES/NO_MDC2;NO_MDC2,NO_RC2,NO_RC4,NO_RC5,-
-       NO_IDEA,NO_BF,NO_CAST,NO_HMAC,NO_SSL2
+       NO_IDEA,NO_BF,NO_CAST,NO_CAMELLIA,NO_HMAC,NO_SSL2
 $ CONFIG_LOG_I = 0
 $ CONFIG_LOG_LOOP:
 $   CONFIG_LOG_E1 = F$ELEMENT(CONFIG_LOG_I,",",CONFIG_LOGICALS)
@@ -424,7 +424,7 @@ $!
 $ SDIRS := ,-
    OBJECTS,-
    MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-
-   DES,RC2,RC4,RC5,IDEA,BF,CAST,-
+   DES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,-
    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,-
@@ -446,6 +446,7 @@ $ EXHEADER_RC5 := rc5.h
 $ EXHEADER_IDEA := idea.h
 $ EXHEADER_BF := blowfish.h
 $ EXHEADER_CAST := cast.h
+$ EXHEADER_CAMELLIA := camellia.h
 $ EXHEADER_BN := bn.h
 $ EXHEADER_EC := ec.h
 $ EXHEADER_RSA := rsa.h