diff options
| author | jsing <> | 2016-12-30 16:29:45 +0000 | 
|---|---|---|
| committer | jsing <> | 2016-12-30 16:29:45 +0000 | 
| commit | 3b4315c7c6a8718ce1ec984e4663189f7288a484 (patch) | |
| tree | fed199e63bd82848ade5744eaa6eb23ac7703b98 /src | |
| parent | 17fc4f92b3a23c850be317c48e4e38acd59df4d3 (diff) | |
| download | openbsd-3b4315c7c6a8718ce1ec984e4663189f7288a484.tar.gz openbsd-3b4315c7c6a8718ce1ec984e4663189f7288a484.tar.bz2 openbsd-3b4315c7c6a8718ce1ec984e4663189f7288a484.zip | |
Place ASN_ITEM_{ptr,rptr,ref} and DECLARE_ASN1_ITEM under #ifndef
LIBRESSL_INTERNAL.
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/asn1/asn1.h | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h index 001bc14412..e35c865e1f 100644 --- a/src/lib/libcrypto/asn1/asn1.h +++ b/src/lib/libcrypto/asn1/asn1.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: asn1.h,v 1.41 2016/12/27 16:51:52 jsing Exp $ */ | 1 | /* $OpenBSD: asn1.h,v 1.42 2016/12/30 16:29:45 jsing Exp $ */ | 
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 
| 3 | * All rights reserved. | 3 | * All rights reserved. | 
| 4 | * | 4 | * | 
| @@ -390,10 +390,11 @@ TYPEDEF_D2I2D_OF(void); | |||
| 390 | * | 390 | * | 
| 391 | */ | 391 | */ | 
| 392 | 392 | ||
| 393 | |||
| 394 | /* ASN1_ITEM pointer exported type */ | 393 | /* ASN1_ITEM pointer exported type */ | 
| 395 | typedef const ASN1_ITEM ASN1_ITEM_EXP; | 394 | typedef const ASN1_ITEM ASN1_ITEM_EXP; | 
| 396 | 395 | ||
| 396 | #ifndef LIBRESSL_INTERNAL | ||
| 397 | |||
| 397 | /* Macro to obtain ASN1_ITEM pointer from exported type */ | 398 | /* Macro to obtain ASN1_ITEM pointer from exported type */ | 
| 398 | #define ASN1_ITEM_ptr(iptr) (iptr) | 399 | #define ASN1_ITEM_ptr(iptr) (iptr) | 
| 399 | 400 | ||
| @@ -405,6 +406,7 @@ typedef const ASN1_ITEM ASN1_ITEM_EXP; | |||
| 405 | #define DECLARE_ASN1_ITEM(name) \ | 406 | #define DECLARE_ASN1_ITEM(name) \ | 
| 406 | extern const ASN1_ITEM name##_it; | 407 | extern const ASN1_ITEM name##_it; | 
| 407 | 408 | ||
| 409 | #endif /* !LIBRESSL_INTERNAL */ | ||
| 408 | 410 | ||
| 409 | /* Parameters used by ASN1_STRING_print_ex() */ | 411 | /* Parameters used by ASN1_STRING_print_ex() */ | 
| 410 | 412 | ||
