From: Norbert Pocs <norbertp@openssl.org>
Date: Thu, 22 May 2025 09:45:49 +0000 (+0200)
Subject: Add deprecation macros for 3.6.0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bc3191b6845fa54f6962055df795fbbaefb12be;p=thirdparty%2Fopenssl.git

Add deprecation macros for 3.6.0

Signed-off-by: Norbert Pocs <norbertp@openssl.org>

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27727)
---

diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index 296723ec423..46e9cf34261 100644
--- a/include/openssl/macros.h
+++ b/include/openssl/macros.h
@@ -169,6 +169,7 @@
  * 'no-deprecated'.
  */
 
+# undef OPENSSL_NO_DEPRECATED_3_6
 # undef OPENSSL_NO_DEPRECATED_3_4
 # undef OPENSSL_NO_DEPRECATED_3_1
 # undef OPENSSL_NO_DEPRECATED_3_0
@@ -179,6 +180,17 @@
 # undef OPENSSL_NO_DEPRECATED_1_0_0
 # undef OPENSSL_NO_DEPRECATED_0_9_8
 
+# if OPENSSL_API_LEVEL >= 30600
+#  ifndef OPENSSL_NO_DEPRECATED
+#   define OSSL_DEPRECATEDIN_3_6                OSSL_DEPRECATED(3.6)
+#   define OSSL_DEPRECATEDIN_3_6_FOR(msg)       OSSL_DEPRECATED_FOR(3.6, msg)
+#  else
+#   define OPENSSL_NO_DEPRECATED_3_6
+#  endif
+# else
+#  define OSSL_DEPRECATEDIN_3_6
+#  define OSSL_DEPRECATEDIN_3_6_FOR(msg)
+# endif
 # if OPENSSL_API_LEVEL >= 30500
 #  ifndef OPENSSL_NO_DEPRECATED
 #   define OSSL_DEPRECATEDIN_3_5                OSSL_DEPRECATED(3.5)