diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-20 10:02:51 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-12-04 20:44:22 +0100 |
| commit | d1b99dd905b2405c77243fcf17f3390512d7731a (patch) | |
| tree | 3f183a6b6cd1354118755502af1cc0f7b567004b /include | |
| parent | 0016a034a7da28df038c9b4a5fd0417b0d9a52af (diff) | |
Switch deprecation method for ASN.1
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13460)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/asn1.h.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/openssl/asn1.h.in b/include/openssl/asn1.h.in index 27476a215f..6a00b3e7f7 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) |