diff options
| -rw-r--r-- | src/lib/libcrypto/asn1/asn1t.h | 5 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/asn1/asn1t.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/libcrypto/asn1/asn1t.h b/src/lib/libcrypto/asn1/asn1t.h index dff0276449..1d96df8148 100644 --- a/src/lib/libcrypto/asn1/asn1t.h +++ b/src/lib/libcrypto/asn1/asn1t.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: asn1t.h,v 1.9 2014/06/12 15:49:27 deraadt Exp $ */ | 1 | /* $OpenBSD: asn1t.h,v 1.10 2015/02/10 08:05:16 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 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -766,6 +766,7 @@ typedef struct ASN1_STREAM_ARG_st { | |||
| 766 | #sname \ | 766 | #sname \ |
| 767 | ASN1_ITEM_end(sname) | 767 | ASN1_ITEM_end(sname) |
| 768 | 768 | ||
| 769 | #ifndef LIBRESSL_INTERNAL | ||
| 769 | /* Macro to implement standard functions in terms of ASN1_ITEM structures */ | 770 | /* Macro to implement standard functions in terms of ASN1_ITEM structures */ |
| 770 | 771 | ||
| 771 | #define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname) | 772 | #define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname) |
| @@ -858,6 +859,8 @@ typedef struct ASN1_STREAM_ARG_st { | |||
| 858 | IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \ | 859 | IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \ |
| 859 | IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) | 860 | IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) |
| 860 | 861 | ||
| 862 | #endif /* !LIBRESSL_INTERNAL */ | ||
| 863 | |||
| 861 | /* external definitions for primitive types */ | 864 | /* external definitions for primitive types */ |
| 862 | 865 | ||
| 863 | DECLARE_ASN1_ITEM(ASN1_BOOLEAN) | 866 | DECLARE_ASN1_ITEM(ASN1_BOOLEAN) |
diff --git a/src/lib/libssl/src/crypto/asn1/asn1t.h b/src/lib/libssl/src/crypto/asn1/asn1t.h index dff0276449..1d96df8148 100644 --- a/src/lib/libssl/src/crypto/asn1/asn1t.h +++ b/src/lib/libssl/src/crypto/asn1/asn1t.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: asn1t.h,v 1.9 2014/06/12 15:49:27 deraadt Exp $ */ | 1 | /* $OpenBSD: asn1t.h,v 1.10 2015/02/10 08:05:16 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 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -766,6 +766,7 @@ typedef struct ASN1_STREAM_ARG_st { | |||
| 766 | #sname \ | 766 | #sname \ |
| 767 | ASN1_ITEM_end(sname) | 767 | ASN1_ITEM_end(sname) |
| 768 | 768 | ||
| 769 | #ifndef LIBRESSL_INTERNAL | ||
| 769 | /* Macro to implement standard functions in terms of ASN1_ITEM structures */ | 770 | /* Macro to implement standard functions in terms of ASN1_ITEM structures */ |
| 770 | 771 | ||
| 771 | #define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname) | 772 | #define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname) |
| @@ -858,6 +859,8 @@ typedef struct ASN1_STREAM_ARG_st { | |||
| 858 | IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \ | 859 | IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \ |
| 859 | IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) | 860 | IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) |
| 860 | 861 | ||
| 862 | #endif /* !LIBRESSL_INTERNAL */ | ||
| 863 | |||
| 861 | /* external definitions for primitive types */ | 864 | /* external definitions for primitive types */ |
| 862 | 865 | ||
| 863 | DECLARE_ASN1_ITEM(ASN1_BOOLEAN) | 866 | DECLARE_ASN1_ITEM(ASN1_BOOLEAN) |
