Commit 0df748e7 authored by Richard Levitte's avatar Richard Levitte
Browse files

Use bg instead of bag as argument to macros, to avoid clashes with 

structure field names.
PR: 112
parent 1fbcfbe6

crypto/pkcs12/pkcs12.h

+2 −2
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ union { 
#define M_PKCS12_decrypt_skey PKCS12_decrypt_skey

#define M_PKCS8_decrypt PKCS8_decrypt



#define M_PKCS12_bag_type(bag) OBJ_obj2nid(bag->type)

#define M_PKCS12_cert_bag_type(bag) OBJ_obj2nid(bag->value.bag->type)

#define M_PKCS12_bag_type(bg) OBJ_obj2nid((bg)->type)

#define M_PKCS12_cert_bag_type(bg) OBJ_obj2nid((bg)->value.bag->type)

#define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type



#define PKCS12_get_attr(bag, attr_nid) \