wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only use compatibility macros for < 1.1 API.

Browse source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2016-02-05 15:43:20 +00:00
parent 70c7778db1
commit 116503cd51
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/openssl/pkcs12.h
View file

@ -113,6 +113,8 @@ typedef struct pkcs12_bag_st PKCS12_BAGS;
/* Compatibility macros */ /* Compatibility macros */
#if OPENSSL_API_COMPAT < 0x10100000L
# define M_PKCS12_x5092certbag PKCS12_x5092certbag # define M_PKCS12_x5092certbag PKCS12_x5092certbag
# define M_PKCS12_x509crl2certbag PKCS12_x509crl2certbag # define M_PKCS12_x509crl2certbag PKCS12_x509crl2certbag
@ -131,7 +133,6 @@ typedef struct pkcs12_bag_st PKCS12_BAGS;
# define M_PKCS12_cert_bag_type PKCS12_cert_bag_type # define M_PKCS12_cert_bag_type PKCS12_cert_bag_type
# define M_PKCS12_crl_bag_type PKCS12_cert_bag_type # define M_PKCS12_crl_bag_type PKCS12_cert_bag_type
/* Compatibility macros for pre 1.1.0 function names */
# define PKCS12_certbag2x509 PKCS12_SAFEBAG_get1_cert # define PKCS12_certbag2x509 PKCS12_SAFEBAG_get1_cert
# define PKCS12_certbag2scrl PKCS12_SAFEBAG_get1_crl # define PKCS12_certbag2scrl PKCS12_SAFEBAG_get1_crl
# define PKCS12_get_attr PKCS12_SAFEBAG_get0_attr # define PKCS12_get_attr PKCS12_SAFEBAG_get0_attr
@ -142,6 +143,8 @@ typedef struct pkcs12_bag_st PKCS12_BAGS;
# define PKCS12_MAKE_KEYBAG PKCS12_SAFEBAG_create0_p8inf # define PKCS12_MAKE_KEYBAG PKCS12_SAFEBAG_create0_p8inf
# define PKCS12_MAKE_SHKEYBAG PKCS12_SAFEBAG_create_pkcs8_encrypt # define PKCS12_MAKE_SHKEYBAG PKCS12_SAFEBAG_create_pkcs8_encrypt
#endif
ASN1_TYPE *PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid); ASN1_TYPE *PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid);
int PKCS12_mac_present(PKCS12 *p12); int PKCS12_mac_present(PKCS12 *p12);
void PKCS12_get0_mac(ASN1_OCTET_STRING **pmac, X509_ALGOR **pmacalg, void PKCS12_get0_mac(ASN1_OCTET_STRING **pmac, X509_ALGOR **pmacalg,