From: Richard Levitte Date: Sun, 30 Sep 2018 00:18:47 +0000 (+0200) Subject: Clean out aliases in include/openssl/symhacks.h X-Git-Tag: OpenSSL_1_1_1a~129 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=236119c48ecaac933fc52d7cbfd8d9214d216122;p=oweals%2Fopenssl.git Clean out aliases in include/openssl/symhacks.h Only a few clashing ones remain Reviewed-by: Paul Yang (Merged from https://github.com/openssl/openssl/pull/7331) (cherry picked from commit b44882a0bd0717e0aab84f5dc3ef81ab673155e9) --- diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h index caf1f1a75d..b6d68efa24 100644 --- a/include/openssl/symhacks.h +++ b/include/openssl/symhacks.h @@ -28,21 +28,6 @@ # undef i2d_ECPKPARAMETERS # define i2d_ECPKPARAMETERS i2d_UC_ECPKPARAMETERS -/* - * These functions do not seem to exist! However, I'm paranoid... Original - * command in x509v3.h: These functions are being redefined in another - * directory, and clash when the linker is case-insensitive, so let's hide - * them a little, by giving them an extra 'o' at the beginning of the name... - */ -# undef X509v3_cleanup_extensions -# define X509v3_cleanup_extensions oX509v3_cleanup_extensions -# undef X509v3_add_extension -# define X509v3_add_extension oX509v3_add_extension -# undef X509v3_add_netscape_extensions -# define X509v3_add_netscape_extensions oX509v3_add_netscape_extensions -# 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