From: Richard Levitte <levitte@openssl.org>
Date: Fri, 20 Nov 2020 09:06:13 +0000 (+0100)
Subject: Switch deprecation method for ERR
X-Git-Tag: openssl-3.0.0-alpha10~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6be9ae210669b505e6ab8300d17f819658551e9;p=thirdparty%2Fopenssl.git

Switch deprecation method for ERR

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13460)
---

diff --git a/include/openssl/err.h.in b/include/openssl/err.h.in
index 6fd749acd03..deb6117d82e 100644
--- a/include/openssl/err.h.in
+++ b/include/openssl/err.h.in
@@ -432,7 +432,9 @@ void ERR_clear_error(void);
 char *ERR_error_string(unsigned long e, char *buf);
 void ERR_error_string_n(unsigned long e, char *buf, size_t len);
 const char *ERR_lib_error_string(unsigned long e);
-DEPRECATEDIN_3_0(const char *ERR_func_error_string(unsigned long e))
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0 const char *ERR_func_error_string(unsigned long e);
+# endif
 const char *ERR_reason_error_string(unsigned long e);
 
 void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u),
@@ -456,10 +458,15 @@ int ERR_unload_strings(int lib, ERR_STRING_DATA *str);
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
 # define ERR_free_strings() while(0) continue
 #endif
-
-DEPRECATEDIN_1_1_0(void ERR_remove_thread_state(void *))
-DEPRECATEDIN_1_0_0(void ERR_remove_state(unsigned long pid))
-DEPRECATEDIN_3_0(ERR_STATE *ERR_get_state(void))
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+OSSL_DEPRECATEDIN_1_1_0 void ERR_remove_thread_state(void *);
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_1_0_0
+OSSL_DEPRECATEDIN_1_0_0 void ERR_remove_state(unsigned long pid);
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0 ERR_STATE *ERR_get_state(void);
+#endif
 
 int ERR_get_next_error_library(void);