From: Richard Levitte Date: Fri, 20 Nov 2020 09:02:51 +0000 (+0100) Subject: Switch deprecation method for ASN.1 X-Git-Tag: openssl-3.0.0-alpha10~166 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1b99dd905b2405c77243fcf17f3390512d7731a;p=thirdparty%2Fopenssl.git Switch deprecation method for ASN.1 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13460) --- diff --git a/include/openssl/asn1.h.in b/include/openssl/asn1.h.in index 27476a215f3..6a00b3e7f7c 100644 --- a/include/openssl/asn1.h.in +++ b/include/openssl/asn1.h.in @@ -572,9 +572,13 @@ int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b); int ASN1_STRING_set(ASN1_STRING *str, const void *data, int len); void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len); int ASN1_STRING_length(const ASN1_STRING *x); -DEPRECATEDIN_3_0(void ASN1_STRING_length_set(ASN1_STRING *x, int n)) +# ifndef OPENSSL_NO_DEPRECATED_3_0 +OSSL_DEPRECATEDIN_3_0 void ASN1_STRING_length_set(ASN1_STRING *x, int n); +# endif int ASN1_STRING_type(const ASN1_STRING *x); -DEPRECATEDIN_1_1_0(unsigned char *ASN1_STRING_data(ASN1_STRING *x)) +# ifndef OPENSSL_NO_DEPRECATED_1_1_0 +OSSL_DEPRECATEDIN_1_1_0 unsigned char *ASN1_STRING_data(ASN1_STRING *x); +# endif const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x); DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)