From 089758f967aefb7159423b2a76eab3f71b75a471 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Sun, 25 Jan 2026 07:35:08 +0100 Subject: [PATCH] [crypto] adjust deprecation warning due to new API functions next release will be 3.22.0 --- include/freerdp/crypto/der.h | 18 +++++------ include/freerdp/crypto/er.h | 58 ++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/include/freerdp/crypto/der.h b/include/freerdp/crypto/der.h index 70d5ed2ed..9c5423c6a 100644 --- a/include/freerdp/crypto/der.h +++ b/include/freerdp/crypto/der.h @@ -31,18 +31,18 @@ extern "C" #endif // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int _der_skip_length(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int der_write_length(wStream* s, int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int der_get_content_length(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int der_skip_octet_string(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int der_skip_sequence_tag(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int _der_skip_length(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int der_write_length(wStream* s, int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int der_get_content_length(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int der_skip_octet_string(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int der_skip_sequence_tag(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int der_write_sequence_tag(wStream* s, int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int der_skip_contextual_tag(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int der_skip_contextual_tag(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int der_write_contextual_tag(wStream* s, BYTE tag, int length, BOOL pc)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API void der_write_octet_string(wStream* s, BYTE* oct_str, int length)); diff --git a/include/freerdp/crypto/er.h b/include/freerdp/crypto/er.h index fc1096e3b..196bafdec 100644 --- a/include/freerdp/crypto/er.h +++ b/include/freerdp/crypto/er.h @@ -63,65 +63,65 @@ extern "C" { #endif - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API void er_read_length(wStream* s, int* length)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API void er_read_length(wStream* s, int* length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_write_length(wStream* s, int length, BOOL flag)); // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int _er_skip_length(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int er_get_content_length(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int _er_skip_length(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_get_content_length(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_read_universal_tag(wStream* s, BYTE tag, BOOL pc)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API void er_write_universal_tag(wStream* s, BYTE tag, BOOL pc)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_read_application_tag(wStream* s, BYTE tag, int* length)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API void er_write_application_tag(wStream* s, BYTE tag, int length, BOOL flag)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_read_enumerated(wStream* s, BYTE* enumerated, BYTE count)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API void er_write_enumerated(wStream* s, BYTE enumerated, BYTE count, BOOL flag)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_read_contextual_tag(wStream* s, BYTE tag, int* length, BOOL pc)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_write_contextual_tag(wStream* s, BYTE tag, int length, BOOL pc, BOOL flag)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int er_skip_contextual_tag(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_skip_contextual_tag(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_read_sequence_tag(wStream* s, int* length)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_write_sequence_tag(wStream* s, int length, BOOL flag)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int er_skip_sequence(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int er_skip_sequence_tag(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_skip_sequence(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_skip_sequence_tag(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_read_bit_string(wStream* s, int* length, BYTE* padding)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_write_bit_string_tag(wStream* s, UINT32 length, BYTE padding, BOOL flag)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_read_octet_string(wStream* s, int* length)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API void er_write_octet_string(wStream* s, BYTE* oct_str, int length, BOOL flag)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_write_octet_string_tag(wStream* s, int length, BOOL flag)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int er_skip_octet_string(int length)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API BOOL er_read_BOOL(wStream* s, BOOL* value)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API void er_write_BOOL(wStream* s, BOOL value)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_skip_octet_string(int length)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_read_BOOL(wStream* s, BOOL* value)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API void er_write_BOOL(wStream* s, BOOL value)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_read_integer(wStream* s, UINT32* value)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int er_write_integer(wStream* s, INT32 value)); - WINPR_DEPRECATED_VAR("since 3.21.1", + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_write_integer(wStream* s, INT32 value)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API BOOL er_read_integer_length(wStream* s, int* length)); - WINPR_DEPRECATED_VAR("since 3.21.1", FREERDP_API int er_skip_integer(INT32 value)); + WINPR_DEPRECATED_VAR("since 3.22.0", FREERDP_API int er_skip_integer(INT32 value)); #ifdef __cplusplus }