diff options
-rw-r--r-- | src/usr.bin/openssl/pkcs12.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c index b725d773da..6195a2cc9a 100644 --- a/src/usr.bin/openssl/pkcs12.c +++ b/src/usr.bin/openssl/pkcs12.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs12.c,v 1.20 2022/04/28 15:42:10 inoguchi Exp $ */ | 1 | /* $OpenBSD: pkcs12.c,v 1.21 2022/08/03 20:17:38 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -71,6 +71,12 @@ | |||
71 | #include <openssl/pem.h> | 71 | #include <openssl/pem.h> |
72 | #include <openssl/pkcs12.h> | 72 | #include <openssl/pkcs12.h> |
73 | 73 | ||
74 | /* XXX: temporary workarounds until the next libcrypto bump. */ | ||
75 | #define PKCS12_get_attr(bag, attr_nid) \ | ||
76 | PKCS12_get_attr_gen(bag->attrib, attr_nid) | ||
77 | #undef PKCS12_certbag2x509 | ||
78 | X509 *PKCS12_certbag2x509(PKCS12_SAFEBAG *bag); | ||
79 | |||
74 | #define NOKEYS 0x1 | 80 | #define NOKEYS 0x1 |
75 | #define NOCERTS 0x2 | 81 | #define NOCERTS 0x2 |
76 | #define INFO 0x4 | 82 | #define INFO 0x4 |