From cdc3cf9ba9f6acf0bd1c4c8224a3c731914a156c Mon Sep 17 00:00:00 2001 From: jsing <> Date: Tue, 13 Oct 2015 16:31:08 +0000 Subject: Put ASN1_dup() under #ifndef LIBRESSL_INTERNAL. --- src/lib/libcrypto/asn1/asn1.h | 10 +++++----- src/lib/libssl/src/crypto/asn1/asn1.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') 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 @@ -/* $OpenBSD: asn1.h,v 1.33 2015/10/08 02:42:58 beck Exp $ */ +/* $OpenBSD: asn1.h,v 1.34 2015/10/13 16:31:08 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -914,6 +914,10 @@ void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag, int ASN1_put_eoc(unsigned char **pp); int ASN1_object_size(int constructed, int length, int tag); +void *ASN1_item_dup(const ASN1_ITEM *it, void *x); + +#ifndef LIBRESSL_INTERNAL + /* Used to implement other functions */ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x); @@ -927,10 +931,6 @@ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x); CHECKED_D2I_OF(type, d2i), \ CHECKED_PTR_OF(const type, x))) -void *ASN1_item_dup(const ASN1_ITEM *it, void *x); - -#ifndef LIBRESSL_INTERNAL - /* ASN1 alloc/free macros for when a type is only used internally */ #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 @@ -/* $OpenBSD: asn1.h,v 1.33 2015/10/08 02:42:58 beck Exp $ */ +/* $OpenBSD: asn1.h,v 1.34 2015/10/13 16:31:08 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -914,6 +914,10 @@ void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag, int ASN1_put_eoc(unsigned char **pp); int ASN1_object_size(int constructed, int length, int tag); +void *ASN1_item_dup(const ASN1_ITEM *it, void *x); + +#ifndef LIBRESSL_INTERNAL + /* Used to implement other functions */ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x); @@ -927,10 +931,6 @@ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x); CHECKED_D2I_OF(type, d2i), \ CHECKED_PTR_OF(const type, x))) -void *ASN1_item_dup(const ASN1_ITEM *it, void *x); - -#ifndef LIBRESSL_INTERNAL - /* ASN1 alloc/free macros for when a type is only used internally */ #define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type)) -- cgit v1.2.3-55-g6feb