VMS addaptation, including a few more long names that needed hacking.

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index e4e4fd4c54acc1a139879ed88aaff172205dcd4d..ec6862e3c2895c28aa02fd3b01c2ae084a06b703 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -187,7 +187,8 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ -
        "enc_read,enc_writ,ofb64enc,"+ -
        "ofb_enc,str2key,pcbc_enc,qud_cksm,rand_key,"+ -
        "des_enc,fcrypt_b,"+ -
-       "fcrypt,xcbc_enc,rpc_enc,cbc_cksm,ede_cbcm_enc,des_old"
+       "fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+
+       "ede_cbcm_enc,des_old,read2pwd"
 $ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64"
 $ LIB_RC4 = "rc4_skey,rc4_enc"
 $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64"
@@ -214,8 +215,8 @@ $ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ -
        "tb_rsa,tb_dsa,tb_dh,tb_rand,tb_cipher,tb_digest,"+ -
        "eng_openssl,eng_dyn,eng_cnf,"+ -
        "hw_atalla,hw_cswift,hw_ncipher,hw_nuron,hw_ubsec,"+ -
-       "hw_openbsd_dev_crypto"
-$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc"
+       "hw_openbsd_dev_crypto,hw_aep,hw_sureware,hw_4758_cca"
+$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr"
 $ LIB_BUFFER = "buffer,buf_err"
 $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
        "bss_mem,bss_null,bss_fd,"+ -
@@ -274,8 +275,8 @@ $ LIB_COMP = "comp_lib,"+ -
        "c_rle,c_zlib"
 $ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -
        "ocsp_srv,ocsp_prn,ocsp_vfy,ocsp_err"
-$ LIB_UI_COMPAT = "ui_compat"
-$ LIB_UI = "ui_err,ui_lib,ui_openssl,"+LIB_UI_COMPAT
+$ LIB_UI_COMPAT = ",ui_compat"
+$ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT
 $ LIB_KRB5 = "krb5_asn"
 $!
 $! Setup exceptional compilations

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 0dcd15ca72a5063861bf421e1b2a8a4f9805c3e8..915fe62341266ce46880621d5693dde6dc7b0a76 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -69,6 +69,8 @@
 
 #include <openssl/ossl_typ.h>
 
+#include <openssl/symhacks.h>
+
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif

diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index d1aff2ae325ca736934651ea31d2de5fff0ffe24..de0f452b476fc09f90b8ed03a80bf23297387fa2 100644 (file)
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -182,6 +182,18 @@
 #undef OCSP_SINGLERESP_get_ext_by_critical
 #define OCSP_SINGLERESP_get_ext_by_critical     OCSP_SINGLERESP_get_ext_by_crit
 
+/* Hack some long DES names */
+#undef _ossl_old_des_ede3_cfb64_encrypt
+#define _ossl_old_des_ede3_cfb64_encrypt       _ossl_odes_ede3_cfb64_encrypt
+#undef _ossl_old_des_ede3_ofb64_encrypt
+#define _ossl_old_des_ede3_ofb64_encrypt       _ossl_odes_ede3_ofb64_encrypt
+
+/* Hack some long EVP names */
+#undef OPENSSL_add_all_algorithms_noconf
+#define OPENSSL_add_all_algorithms_noconf      OPENSSL_add_all_algo_noconf
+#undef OPENSSL_add_all_algorithms_conf
+#define OPENSSL_add_all_algorithms_conf                OPENSSL_add_all_algo_conf
+
 /* Hack some long EC names */
 #undef EC_POINT_set_Jprojective_coordinates_GFp
 #define EC_POINT_set_Jprojective_coordinates_GFp \