From: Dr. Stephen Henson Date: Mon, 8 Feb 2016 19:10:12 +0000 (+0000) Subject: Remove ancient compatibility defines. X-Git-Tag: OpenSSL_1_1_0-pre3~190 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9fc65806d5c879ffa9ada4941f11e82c21cb3dd2;p=oweals%2Fopenssl.git Remove ancient compatibility defines. Reviewed-by: Rich Salz --- diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h index f97f95f68b..655655a5af 100644 --- a/include/openssl/pkcs12.h +++ b/include/openssl/pkcs12.h @@ -115,20 +115,6 @@ typedef struct pkcs12_bag_st PKCS12_BAGS; #if OPENSSL_API_COMPAT < 0x10100000L -# define M_PKCS12_x5092certbag PKCS12_x5092certbag -# define M_PKCS12_x509crl2certbag PKCS12_x509crl2certbag - -# define M_PKCS12_certbag2x509 PKCS12_certbag2x509 -# define M_PKCS12_certbag2x509crl PKCS12_certbag2x509crl - -# define M_PKCS12_unpack_p7data PKCS12_unpack_p7data -# define M_PKCS12_pack_authsafes PKCS12_pack_authsafes -# define M_PKCS12_unpack_authsafes PKCS12_unpack_authsafes -# define M_PKCS12_unpack_p7encdata PKCS12_unpack_p7encdata - -# define M_PKCS12_decrypt_skey PKCS12_decrypt_skey -# define M_PKCS8_decrypt PKCS8_decrypt - # define M_PKCS12_bag_type PKCS12_bag_type # define M_PKCS12_cert_bag_type PKCS12_cert_bag_type # define M_PKCS12_crl_bag_type PKCS12_cert_bag_type