diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-27 01:09:27 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-02-08 18:43:48 +0000 |
| commit | e8503762da9df43a414fc5d6c2d0399779f0ff33 (patch) | |
| tree | 758fa6ced1a9bcb2c209d5059250486c4e6ba6ee /include | |
| parent | 776cfa9bfbc4af1b41454b08f13b205766fa0eb9 (diff) | |
Rename PKCS12 function
Rename ancient PKCS12 functions to use more logical names. Include
defines from old to new name.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/pkcs12.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h index 079ac1af07..155eac494e 100644 --- a/include/openssl/pkcs12.h +++ b/include/openssl/pkcs12.h @@ -131,23 +131,32 @@ typedef struct pkcs12_bag_st PKCS12_BAGS; # define M_PKCS12_cert_bag_type PKCS12_cert_bag_type # define M_PKCS12_crl_bag_type PKCS12_cert_bag_type -ASN1_TYPE *PKCS12_get_attr(PKCS12_SAFEBAG *bag, int attr_nid); +/* Compatibility macros for pre 1.1.0 function names */ +# define PKCS12_x5092certbag PKCS12_SAFEBAG_new_cert +# define PKCS12_crl2certbag PKCS12_SAFEBAG_new_crl +# define PKCS12_certbag2x509 PKCS12_SAFEBAG_get1_cert +# define PKCS12_certbag2scrl PKCS12_SAFEBAG_get1_crl +# define PKCS12_get_attr PKCS12_SAFEBAG_get0_attr +# define PKCS12_bag_type PKCS12_SAFEBAG_get_nid +# define PKCS12_cert_bag_type PKCS12_SAFEBAG_get_bag_nid + +ASN1_TYPE *PKCS12_SAFEBAG_get0_attr(PKCS12_SAFEBAG *bag, int attr_nid); ASN1_TYPE *PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid); int PKCS12_mac_present(PKCS12 *p12); void PKCS12_get0_mac(ASN1_OCTET_STRING **pmac, X509_ALGOR **pmacalg, ASN1_OCTET_STRING **psalt, ASN1_INTEGER **piter, PKCS12 *p12); -int PKCS12_bag_type(PKCS12_SAFEBAG *bag); -int PKCS12_cert_bag_type(PKCS12_SAFEBAG *bag); +int PKCS12_SAFEBAG_get_nid(PKCS12_SAFEBAG *bag); +int PKCS12_SAFEBAG_get_bag_nid(PKCS12_SAFEBAG *bag); PKCS8_PRIV_KEY_INFO *PKCS12_SAFEBAG_get0_p8inf(PKCS12_SAFEBAG *bag); X509_SIG *PKCS12_SAFEBAG_get0_pkcs8(PKCS12_SAFEBAG *bag); STACK_OF(PKCS12_SAFEBAG) *PKCS12_SAFEBAG_get0_safes(PKCS12_SAFEBAG *bag); ASN1_OBJECT *PKCS12_SAFEBAG_get0_type(PKCS12_SAFEBAG *bag); -PKCS12_SAFEBAG *PKCS12_x5092certbag(X509 *x509); -PKCS12_SAFEBAG *PKCS12_x509crl2certbag(X509_CRL *crl); -X509 *PKCS12_certbag2x509(PKCS12_SAFEBAG *bag); -X509_CRL *PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag); +PKCS12_SAFEBAG *PKCS12_SAFEBAG_new_cert(X509 *x509); +PKCS12_SAFEBAG *PKCS12_SAFEBAG_new_crl(X509_CRL *crl); +X509 *PKCS12_SAFEBAG_get1_cert(PKCS12_SAFEBAG *bag); +X509_CRL *PKCS12_SAFEBAG_get1_crl(PKCS12_SAFEBAG *bag); PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it, int nid1, int nid2); |