diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2016-12-30 15:08:59 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2016-12-30 15:08:59 +0000 |
| commit | e5611e03938a2a43bdd2f41aa5b6b11717734082 (patch) | |
| tree | 108791bb3a090386efa4d2055a3bf7b2d60fe5ad /lib/libcrypto/pkcs12 | |
| parent | 717d7c39aa4f52a21fb7f169d067d58e9e5667cf (diff) | |
Place M_PKCS12_* compatibility macros under #ifndef LIBRESSL_INTERNAL.
Diffstat (limited to 'lib/libcrypto/pkcs12')
| -rw-r--r-- | lib/libcrypto/pkcs12/pkcs12.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libcrypto/pkcs12/pkcs12.h b/lib/libcrypto/pkcs12/pkcs12.h index c09508efd28..e30f9ac790d 100644 --- a/lib/libcrypto/pkcs12/pkcs12.h +++ b/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) |