diff options
| author |   jsing <jsing@openbsd.org> | 2016-12-30 15:08:58 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2016-12-30 15:08:58 +0000 |
| commit | 8ed5067d34a1ecf6600cc8b49c1ae64e3471d674 (patch) | |
| tree | fb0b2bba5d8d96084e7f0b2b3f4d1e490074aa9c | |
| parent | Expand M_PKCS12_* "compatibility" macros. No change to generated assembly. (diff) | |
| download | wireguard-openbsd-8ed5067d34a1ecf6600cc8b49c1ae64e3471d674.tar.xz wireguard-openbsd-8ed5067d34a1ecf6600cc8b49c1ae64e3471d674.zip | |
Place M_PKCS12_* compatibility macros under #ifndef LIBRESSL_INTERNAL.
| -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) |