=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/pkcs12.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- src/usr.bin/openssl/pkcs12.c 2022/04/28 15:42:10 1.20 +++ src/usr.bin/openssl/pkcs12.c 2022/08/03 20:17:38 1.21 @@ -1,4 +1,4 @@ -/* $OpenBSD: pkcs12.c,v 1.20 2022/04/28 15:42:10 inoguchi Exp $ */ +/* $OpenBSD: pkcs12.c,v 1.21 2022/08/03 20:17:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -70,6 +70,12 @@ #include #include #include + +/* XXX: temporary workarounds until the next libcrypto bump. */ +#define PKCS12_get_attr(bag, attr_nid) \ + PKCS12_get_attr_gen(bag->attrib, attr_nid) +#undef PKCS12_certbag2x509 +X509 *PKCS12_certbag2x509(PKCS12_SAFEBAG *bag); #define NOKEYS 0x1 #define NOCERTS 0x2