diff options
author | jsing <> | 2015-10-13 16:31:08 +0000 |
---|---|---|
committer | jsing <> | 2015-10-13 16:31:08 +0000 |
commit | cdc3cf9ba9f6acf0bd1c4c8224a3c731914a156c (patch) | |
tree | c338087ed26ccfbb0415d97753c2aa0941dae74a /src | |
parent | 118a859ea4c28f8b6ffd00540de9e1b511925ae7 (diff) | |
download | openbsd-cdc3cf9ba9f6acf0bd1c4c8224a3c731914a156c.tar.gz openbsd-cdc3cf9ba9f6acf0bd1c4c8224a3c731914a156c.tar.bz2 openbsd-cdc3cf9ba9f6acf0bd1c4c8224a3c731914a156c.zip |
Put ASN1_dup() under #ifndef LIBRESSL_INTERNAL.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/asn1/asn1.h | 10 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/asn1/asn1.h | 10 |
2 files changed, 10 insertions, 10 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)) |
diff --git a/src/lib/libssl/src/crypto/asn1/asn1.h b/src/lib/libssl/src/crypto/asn1/asn1.h index 9905df5f74..c5d9b55e40 100644 --- a/src/lib/libssl/src/crypto/asn1/asn1.h +++ b/src/lib/libssl/src/crypto/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)) |