From: Richard Levitte Date: Sat, 12 Apr 2008 08:40:01 +0000 (+0000) Subject: Provide other forms for symbols that are too long or that clash with others X-Git-Tag: OpenSSL_0_9_8k^2~436 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b35a13106989b14ad52ddc6b827c2be2e86e90e2;p=thirdparty%2Fopenssl.git Provide other forms for symbols that are too long or that clash with others --- diff --git a/crypto/symhacks.h b/crypto/symhacks.h index 00d6e33f161..c59e3bf5f01 100644 --- a/crypto/symhacks.h +++ b/crypto/symhacks.h @@ -352,7 +352,7 @@ #undef STORE_method_get_unlock_store_function #define STORE_method_get_unlock_store_function STORE_meth_get_unlock_store_fn -/* Hack som long TS names */ +/* Hack some long TS names */ #undef TS_RESP_CTX_set_status_info_cond #define TS_RESP_CTX_set_status_info_cond TS_RESP_CTX_set_stat_info_cond #undef TS_RESP_CTX_set_clock_precision_digits @@ -360,6 +360,20 @@ #undef TS_CONF_set_clock_precision_digits #define TS_CONF_set_clock_precision_digits TS_CONF_set_clk_prec_digits +/* Hack some long CMS names */ +#undef CMS_RecipientInfo_ktri_get0_algs +#define CMS_RecipientInfo_ktri_get0_algs CMS_RecipInfo_ktri_get0_algs +#undef CMS_RecipientInfo_ktri_get0_signer_id +#define CMS_RecipientInfo_ktri_get0_signer_id CMS_RecipInfo_ktri_get0_sigr_id +#undef CMS_OtherRevocationInfoFormat_it +#define CMS_OtherRevocationInfoFormat_it CMS_OtherRevocInfoFormat_it +#undef CMS_KeyAgreeRecipientIdentifier_it +#define CMS_KeyAgreeRecipientIdentifier_it CMS_KeyAgreeRecipIdentifier_it +#undef CMS_OriginatorIdentifierOrKey_it +#define CMS_OriginatorIdentifierOrKey_it CMS_OriginatorIdOrKey_it +#undef cms_SignerIdentifier_get0_signer_id +#define cms_SignerIdentifier_get0_signer_id cms_SignerId_get0_signer_id + #endif /* defined OPENSSL_SYS_VMS */ @@ -394,6 +408,9 @@ #undef X509v3_add_standard_extensions #define X509v3_add_standard_extensions oX509v3_add_standard_extensions +/* This one clashes with CMS_data_create */ +#undef cms_Data_create +#define cms_Data_create priv_cms_Data_create #endif