Merge changes from 0.9.7-stable

[openssl.git] / crypto / symhacks.h

diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index 3f9d6f1ac55d93a0444a2c1b8288fb1afdb2f0fc..de0f452b476fc09f90b8ed03a80bf23297387fa2 100644 (file)
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -62,6 +62,12 @@
    VAX. */
 #ifdef OPENSSL_SYS_VMS
 
+/* Hack a long name in crypto/ex_data.c */
+#undef CRYPTO_get_ex_data_implementation
+#define CRYPTO_get_ex_data_implementation      CRYPTO_get_ex_data_impl
+#undef CRYPTO_set_ex_data_implementation
+#define CRYPTO_set_ex_data_implementation      CRYPTO_set_ex_data_impl
+
 /* Hack a long name in crypto/asn1/a_mbstr.c */
 #undef ASN1_STRING_set_default_mask_asc
 #define ASN1_STRING_set_default_mask_asc       ASN1_STRING_set_def_mask_asc
@@ -176,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 \
@@ -250,6 +268,7 @@
 #undef X509v3_add_standard_extensions
 #define X509v3_add_standard_extensions          oX509v3_add_standard_extensions
 
+
 #endif