From 7cb5cc537bf1f81f4401e584185c508b46c4dc86 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 30 Dec 2016 15:08:58 +0000
Subject: Place M_PKCS12_* compatibility macros under #ifndef
 LIBRESSL_INTERNAL.

---
 src/lib/libcrypto/pkcs12/pkcs12.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 @@
-/* $OpenBSD: pkcs12.h,v 1.16 2016/12/27 16:05:57 jsing Exp $ */
+/* $OpenBSD: pkcs12.h,v 1.17 2016/12/30 15:08:58 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -137,6 +137,8 @@ typedef struct pkcs12_bag_st {
 #define PKCS12_ERROR	0
 #define PKCS12_OK	1
 
+#ifndef LIBRESSL_INTERNAL
+
 /* Compatibility macros */
 
 #define M_PKCS12_x5092certbag PKCS12_x5092certbag
@@ -157,6 +159,8 @@ typedef struct pkcs12_bag_st {
 #define M_PKCS12_cert_bag_type(bg) OBJ_obj2nid((bg)->value.bag->type)
 #define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type
 
+#endif /* !LIBRESSL_INTERNAL */
+
 #define PKCS12_get_attr(bag, attr_nid) \
 			 PKCS12_get_attr_gen(bag->attrib, attr_nid)
 
-- 
cgit v1.2.3-55-g6feb