diff options
| author | jsing <> | 2015-10-13 16:31:08 +0000 |
|---|---|---|
| committer | jsing <> | 2015-10-13 16:31:08 +0000 |
| commit | 29af72a28deb733a7f4d9cbb1e2d6a7b35741c4e (patch) | |
| tree | c338087ed26ccfbb0415d97753c2aa0941dae74a /src/lib/libc | |
| parent | 806c5b40bbd3b0ebf4c6dc188e025d4d442a4d33 (diff) | |
| download | openbsd-29af72a28deb733a7f4d9cbb1e2d6a7b35741c4e.tar.gz openbsd-29af72a28deb733a7f4d9cbb1e2d6a7b35741c4e.tar.bz2 openbsd-29af72a28deb733a7f4d9cbb1e2d6a7b35741c4e.zip | |
Put ASN1_dup() under #ifndef LIBRESSL_INTERNAL.
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/asn1/asn1.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h index 9905df5f74..c5d9b55e40 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.33 2015/10/08 02:42:58 beck Exp $ */ | 1 | /* $OpenBSD: asn1.h,v 1.34 2015/10/13 16:31:08 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 | * |
| @@ -914,6 +914,10 @@ void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag, | |||
| 914 | int ASN1_put_eoc(unsigned char **pp); | 914 | int ASN1_put_eoc(unsigned char **pp); |
| 915 | int ASN1_object_size(int constructed, int length, int tag); | 915 | int ASN1_object_size(int constructed, int length, int tag); |
| 916 | 916 | ||
| 917 | void *ASN1_item_dup(const ASN1_ITEM *it, void *x); | ||
| 918 | |||
| 919 | #ifndef LIBRESSL_INTERNAL | ||
| 920 | |||
| 917 | /* Used to implement other functions */ | 921 | /* Used to implement other functions */ |
| 918 | void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x); | 922 | void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x); |
| 919 | 923 | ||
| @@ -927,10 +931,6 @@ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x); | |||
| 927 | CHECKED_D2I_OF(type, d2i), \ | 931 | CHECKED_D2I_OF(type, d2i), \ |
| 928 | CHECKED_PTR_OF(const type, x))) | 932 | CHECKED_PTR_OF(const type, x))) |
| 929 | 933 | ||
| 930 | void *ASN1_item_dup(const ASN1_ITEM *it, void *x); | ||
| 931 | |||
| 932 | #ifndef LIBRESSL_INTERNAL | ||
| 933 | |||
| 934 | /* ASN1 alloc/free macros for when a type is only used internally */ | 934 | /* ASN1 alloc/free macros for when a type is only used internally */ |
| 935 | 935 | ||
| 936 | #define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type)) | 936 | #define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type)) |
