diff options
| author |   jsing <jsing@openbsd.org> | 2016-12-27 15:12:51 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2016-12-27 15:12:51 +0000 |
| commit | 394205804c3fe77bb93dfe14d27c7c9da7b1299e (patch) | |
| tree | fdbd3569967f9a6ef5be6db6bca7b655d5fb3bc8 | |
| parent | The "disk too large" and "only LBA values saved" messages are more (diff) | |
| download | wireguard-openbsd-394205804c3fe77bb93dfe14d27c7c9da7b1299e.tar.xz wireguard-openbsd-394205804c3fe77bb93dfe14d27c7c9da7b1299e.zip | |
Expand DECLARE_ASN1_ITEM macros - no change in preprocessor output.
| -rw-r--r-- | lib/libcrypto/asn1/asn1.h | 6 | ||||
| -rw-r--r-- | lib/libcrypto/asn1/asn1t.h | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h index d744b64665e..09ba64528fc 100644 --- a/lib/libcrypto/asn1/asn1.h +++ b/lib/libcrypto/asn1/asn1.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1.h,v 1.36 2016/12/27 09:12:19 jsing Exp $ */ +/* $OpenBSD: asn1.h,v 1.37 2016/12/27 15:12:51 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -759,7 +759,7 @@ ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, long length); -DECLARE_ASN1_ITEM(ASN1_OBJECT) +extern const ASN1_ITEM ASN1_OBJECT_it; DECLARE_STACK_OF(ASN1_OBJECT) DECLARE_ASN1_SET_OF(ASN1_OBJECT) @@ -915,7 +915,7 @@ ASN1_TIME *d2i_ASN1_TIME(ASN1_TIME **a, const unsigned char **in, long len); int i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **out); extern const ASN1_ITEM ASN1_TIME_it; -DECLARE_ASN1_ITEM(ASN1_OCTET_STRING_NDEF) +extern const ASN1_ITEM ASN1_OCTET_STRING_NDEF_it; ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t); ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t, int offset_day, diff --git a/lib/libcrypto/asn1/asn1t.h b/lib/libcrypto/asn1/asn1t.h index 27f591c464e..ba380bdf413 100644 --- a/lib/libcrypto/asn1/asn1t.h +++ b/lib/libcrypto/asn1/asn1t.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1t.h,v 1.13 2015/07/25 17:20:02 jsing Exp $ */ +/* $OpenBSD: asn1t.h,v 1.14 2016/12/27 15:12:51 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -831,14 +831,14 @@ typedef struct ASN1_STREAM_ARG_st { /* external definitions for primitive types */ -DECLARE_ASN1_ITEM(ASN1_BOOLEAN) -DECLARE_ASN1_ITEM(ASN1_TBOOLEAN) -DECLARE_ASN1_ITEM(ASN1_FBOOLEAN) -DECLARE_ASN1_ITEM(ASN1_SEQUENCE) -DECLARE_ASN1_ITEM(CBIGNUM) -DECLARE_ASN1_ITEM(BIGNUM) -DECLARE_ASN1_ITEM(LONG) -DECLARE_ASN1_ITEM(ZLONG) +extern const ASN1_ITEM ASN1_BOOLEAN_it; +extern const ASN1_ITEM ASN1_TBOOLEAN_it; +extern const ASN1_ITEM ASN1_FBOOLEAN_it; +extern const ASN1_ITEM ASN1_SEQUENCE_it; +extern const ASN1_ITEM CBIGNUM_it; +extern const ASN1_ITEM BIGNUM_it; +extern const ASN1_ITEM LONG_it; +extern const ASN1_ITEM ZLONG_it; DECLARE_STACK_OF(ASN1_VALUE) |