Synchronise with Unixly build.

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 44a99af04fe66d3cb1a5a34aedcbcea271be10fc..bef2b192fa35eaba03a1714c42f5275e166e9348 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,JPAKE"
 $!
 $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
@@ -277,7 +277,10 @@ $ 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_JPAKE = "jpake,jpake_err"
 $!
 $! Setup exceptional compilations
 $!

diff --git a/crypto/install.com b/crypto/install.com
index 44390e0f94e70e0967e4b90542353f474bcebf4d..ffad1f97a72ffffd9b0bf2cff0e34a8a6edc6a53 100644 (file)
--- a/crypto/install.com
+++ b/crypto/install.com
@@ -35,12 +35,12 @@ $
 $      SDIRS := ,-
                 OBJECTS,-
                 MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,-
-                DES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-
-                BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,AES,-
+                DES,AES,RC2,RC4,RC5,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,-
                 UI,KRB5,-
-                STORE,PQUEUE
+                STORE,PQUEUE,JPAKE
 $      EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,-
                symhacks.h,ossl_typ.h
 $      EXHEADER_OBJECTS := objects.h,obj_mac.h
@@ -52,6 +52,7 @@ $     EXHEADER_MDC2 := mdc2.h
 $      EXHEADER_HMAC := hmac.h
 $      EXHEADER_RIPEMD := ripemd.h
 $      EXHEADER_DES := des.h,des_old.h
+$      EXHEADER_AES := aes.h
 $      EXHEADER_RC2 := rc2.h
 $      EXHEADER_RC4 := rc4.h
 $      EXHEADER_RC5 := rc5.h
@@ -69,7 +70,6 @@ $     EXHEADER_DH := dh.h
 $      EXHEADER_ECDH := ecdh.h
 $      EXHEADER_DSO := dso.h
 $      EXHEADER_ENGINE := engine.h
-$      EXHEADER_AES := aes.h
 $      EXHEADER_BUFFER := buffer.h
 $      EXHEADER_BIO := bio.h
 $      EXHEADER_STACK := stack.h,safestack.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_JPAKE := jpake.h
 $      LIBS := LIBCRYPTO
 $
 $      VEXE_DIR := [-.VAX.EXE.CRYPTO]

diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index 64528ad5c2ef7f0f0d57a24bee4f77c34379ec4c..6cfb5fe4794b8a487ec08d189b6433e851a91599 100644 (file)
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -179,6 +179,11 @@
 #define ENGINE_set_load_privkey_function        ENGINE_set_load_privkey_fn
 #undef ENGINE_get_load_privkey_function
 #define ENGINE_get_load_privkey_function        ENGINE_get_load_privkey_fn
+#undef ENGINE_set_load_ssl_client_cert_function
+#define ENGINE_set_load_ssl_client_cert_function \
+                                               ENGINE_set_ld_ssl_clnt_cert_fn
+#undef ENGINE_get_ssl_client_cert_function
+#define ENGINE_get_ssl_client_cert_function    ENGINE_get_ssl_client_cert_fn
 
 /* Hack some long OCSP names */
 #undef OCSP_REQUEST_get_ext_by_critical

diff --git a/makevms.com b/makevms.com
index 4f70308082bf87ee6493a73d2232cc248b39bfe9..e0b856d1bb798b27f14b8ec3f5a1d9916561d4b8 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -429,11 +429,11 @@ $!
 $ SDIRS := ,-
    OBJECTS,-
    MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,-
-   DES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-
-   BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,AES,-
+   DES,AES,RC2,RC4,RC5,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,UI,KRB5,-
-   STORE,CMS,PQUEUE
+   STORE,CMS,PQUEUE,JPAKE
 $ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h,-
                ossl_typ.h
 $ EXHEADER_OBJECTS := objects.h,obj_mac.h
@@ -445,6 +445,7 @@ $ EXHEADER_MDC2 := mdc2.h
 $ EXHEADER_HMAC := hmac.h
 $ EXHEADER_RIPEMD := ripemd.h
 $ EXHEADER_DES := des.h,des_old.h
+$ EXHEADER_AES := aes.h
 $ EXHEADER_RC2 := rc2.h
 $ EXHEADER_RC4 := rc4.h
 $ EXHEADER_RC5 := rc5.h
@@ -462,7 +463,6 @@ $ EXHEADER_DH := dh.h
 $ EXHEADER_ECDH := ecdh.h
 $ EXHEADER_DSO := dso.h
 $ EXHEADER_ENGINE := engine.h
-$ EXHEADER_AES := aes.h
 $ EXHEADER_BUFFER := buffer.h
 $ EXHEADER_BIO := bio.h
 $ EXHEADER_STACK := stack.h,safestack.h
@@ -486,6 +486,7 @@ $!EXHEADER_STORE := store.h,str_compat.h
 $ EXHEADER_STORE := store.h
 $ EXHEADER_CMS := cms.h
 $ EXHEADER_PQUEUE := pqueue.h,pq_compat.h
+$ EXHEADER_JPAKE := jpake.h
 $
 $ I = 0
 $ LOOP_SDIRS: 

diff --git a/test/tests.com b/test/tests.com
index 056082e7fe7ce2fbd316dbe36febbec173320139..88a33d0531b7f1a679252112df3d2570598565a3 100644 (file)
--- a/test/tests.com
+++ b/test/tests.com
@@ -25,7 +25,7 @@ $         tests := -
        test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,-
        test_enc,test_x509,test_rsa,test_crl,test_sid,-
        test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,-
-       test_ss,test_ca,test_engine,test_evp,test_ssl
+       test_ss,test_ca,test_engine,test_evp,test_ssl,test_ige,test_jpake
 $      endif
 $      tests = f$edit(tests,"COLLAPSE")
 $
@@ -57,6 +57,8 @@ $     SSLTEST :=      ssltest
 $      RSATEST :=      rsa_test
 $      ENGINETEST :=   enginetest
 $      EVPTEST :=      evp_test
+$      IGETEST :=      igetest
+$      JPAKETEST :=    jpaketest
 $
 $      tests_i = 0
 $ loop_tests:
@@ -250,6 +252,14 @@ $ test_rd:
 $      write sys$output "test Rijndael"
 $      !mcr 'texe_dir''rdtest'
 $      return
+$ test_ige: 
+$      write sys$output "Test IGE mode"
+$      mcr 'texe_dir''igetest'
+$      return
+$ test_jpake: 
+$      write sys$output "Test JPAKE"
+$      mcr 'texe_dir''jpaketest'
+$      return
 $
 $
 $ exit: