From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 30 Apr 2024 09:31:49 +0000 (+0200)
Subject: include/openssl/macros.h: define deprecation macros for 3.4
X-Git-Tag: openssl-3.4.0-alpha1~508
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ce2a09ae6987901337187d89164edeb003a834c;p=thirdparty%2Fopenssl.git

include/openssl/macros.h: define deprecation macros for 3.4

Signed-off-by: Alexander Kanavin <alex@linutronix.de>

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24307)
---

diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index e9ef9387470..d9a29da915b 100644
--- a/include/openssl/macros.h
+++ b/include/openssl/macros.h
@@ -169,6 +169,7 @@
  * 'no-deprecated'.
  */
 
+# undef OPENSSL_NO_DEPRECATED_3_4
 # undef OPENSSL_NO_DEPRECATED_3_1
 # undef OPENSSL_NO_DEPRECATED_3_0
 # undef OPENSSL_NO_DEPRECATED_1_1_1
@@ -178,6 +179,17 @@
 # undef OPENSSL_NO_DEPRECATED_1_0_0
 # undef OPENSSL_NO_DEPRECATED_0_9_8
 
+# if OPENSSL_API_LEVEL >= 30400
+#  ifndef OPENSSL_NO_DEPRECATED
+#   define OSSL_DEPRECATEDIN_3_4                OSSL_DEPRECATED(3.4)
+#   define OSSL_DEPRECATEDIN_3_4_FOR(msg)       OSSL_DEPRECATED_FOR(3.4, msg)
+#  else
+#   define OPENSSL_NO_DEPRECATED_3_4
+#  endif
+# else
+#  define OSSL_DEPRECATEDIN_3_4
+#  define OSSL_DEPRECATEDIN_3_4_FOR(msg)
+# endif
 # if OPENSSL_API_LEVEL >= 30100
 #  ifndef OPENSSL_NO_DEPRECATED
 #   define OSSL_DEPRECATEDIN_3_1                OSSL_DEPRECATED(3.1)