From be5b2b64a559628dff876cfdf028308cbe6c7e2d Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 20 Nov 2020 10:07:40 +0100 Subject: [PATCH] Switch deprecation method for MDC2 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13460) --- include/openssl/mdc2.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/openssl/mdc2.h b/include/openssl/mdc2.h index c8ebe0d9d2..5a7ee289d1 100644 --- a/include/openssl/mdc2.h +++ b/include/openssl/mdc2.h @@ -38,13 +38,14 @@ typedef struct mdc2_ctx_st { unsigned int pad_type; /* either 1 or 2, default 1 */ } MDC2_CTX; # endif - -DEPRECATEDIN_3_0(int MDC2_Init(MDC2_CTX *c)) -DEPRECATEDIN_3_0(int MDC2_Update(MDC2_CTX *c, const unsigned char *data, - size_t len)) -DEPRECATEDIN_3_0(int MDC2_Final(unsigned char *md, MDC2_CTX *c)) -DEPRECATEDIN_3_0(unsigned char *MDC2(const unsigned char *d, size_t n, - unsigned char *md)) +# ifndef OPENSSL_NO_DEPRECATED_3_0 +OSSL_DEPRECATEDIN_3_0 int MDC2_Init(MDC2_CTX *c); +OSSL_DEPRECATEDIN_3_0 int MDC2_Update(MDC2_CTX *c, const unsigned char *data, + size_t len); +OSSL_DEPRECATEDIN_3_0 int MDC2_Final(unsigned char *md, MDC2_CTX *c); +OSSL_DEPRECATEDIN_3_0 unsigned char *MDC2(const unsigned char *d, size_t n, + unsigned char *md); +# endif # ifdef __cplusplus } -- 2.34.1