summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/pkcs12/pkcs12.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h
index c09508efd2..e30f9ac790 100644
--- a/src/lib/libcrypto/pkcs12/pkcs12.h
+++ b/src/lib/libcrypto/pkcs12/pkcs12.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs12.h,v 1.16 2016/12/27 16:05:57 jsing Exp $ */ 1/* $OpenBSD: pkcs12.h,v 1.17 2016/12/30 15:08:58 jsing 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 1999. 3 * project 1999.
4 */ 4 */
@@ -137,6 +137,8 @@ typedef struct pkcs12_bag_st {
137#define PKCS12_ERROR 0 137#define PKCS12_ERROR 0
138#define PKCS12_OK 1 138#define PKCS12_OK 1
139 139
140#ifndef LIBRESSL_INTERNAL
141
140/* Compatibility macros */ 142/* Compatibility macros */
141 143
142#define M_PKCS12_x5092certbag PKCS12_x5092certbag 144#define M_PKCS12_x5092certbag PKCS12_x5092certbag
@@ -157,6 +159,8 @@ typedef struct pkcs12_bag_st {
157#define M_PKCS12_cert_bag_type(bg) OBJ_obj2nid((bg)->value.bag->type) 159#define M_PKCS12_cert_bag_type(bg) OBJ_obj2nid((bg)->value.bag->type)
158#define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type 160#define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type
159 161
162#endif /* !LIBRESSL_INTERNAL */
163
160#define PKCS12_get_attr(bag, attr_nid) \ 164#define PKCS12_get_attr(bag, attr_nid) \
161 PKCS12_get_attr_gen(bag->attrib, attr_nid) 165 PKCS12_get_attr_gen(bag->attrib, attr_nid)
162 166