X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fsymhacks.h;h=ff558a43d8d9dbe2fc629b8e85116cef0e06b01d;hb=7e6617611f833385257dcfa11dc5e4d1aedf1591;hp=c7f39cfa81ff54acb3ed883c0f088723ed622af7;hpb=c41b29e5dbdd8fe6f1c21cbd5a8a99c0bd7d3d30;p=oweals%2Fopenssl.git

diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index c7f39cfa81..ff558a43d8 100644
--- 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 \
@@ -230,12 +242,14 @@
 #undef ec_GFp_simple_set_compressed_coordinates_GFp
 #define ec_GFp_simple_set_compressed_coordinates_GFp \
                                                 ec_GFp_smp_set_compr_coords_GFp
+#undef ec_GFp_simple_group_check_discriminant
+#define ec_GFp_simple_group_check_discriminant	ec_GFp_simple_grp_chk_discrim
 
 #endif /* defined OPENSSL_SYS_VMS */
 
 
 /* Case insensiteve linking causes problems.... */
-#if defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_VMS)
+#if defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2)
 #undef ERR_load_CRYPTO_strings
 #define ERR_load_CRYPTO_strings			ERR_load_CRYPTOlib_strings
 #undef OCSP_crlID_new
@@ -256,6 +270,7 @@
 #undef X509v3_add_standard_extensions
 #define X509v3_add_standard_extensions          oX509v3_add_standard_extensions
 
+
 #endif