From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 2 Oct 2023 13:49:42 +0000 (+0200)
Subject: macros.h: There are just 3.1 deprecations, no 3.2 deprecations
X-Git-Tag: openssl-3.2.0-beta1~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f66602eaa0a034847e9b1347c108b82c60b41d7;p=thirdparty%2Fopenssl.git

macros.h: There are just 3.1 deprecations, no 3.2 deprecations

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22247)
---

diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index 66fa4eec2e7..e9ef9387470 100644
--- a/include/openssl/macros.h
+++ b/include/openssl/macros.h
@@ -169,7 +169,7 @@
  * 'no-deprecated'.
  */
 
-# undef OPENSSL_NO_DEPRECATED_3_2
+# undef OPENSSL_NO_DEPRECATED_3_1
 # undef OPENSSL_NO_DEPRECATED_3_0
 # undef OPENSSL_NO_DEPRECATED_1_1_1
 # undef OPENSSL_NO_DEPRECATED_1_1_0
@@ -178,16 +178,16 @@
 # undef OPENSSL_NO_DEPRECATED_1_0_0
 # undef OPENSSL_NO_DEPRECATED_0_9_8
 
-# if OPENSSL_API_LEVEL >= 30200
+# if OPENSSL_API_LEVEL >= 30100
 #  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_3_2                OSSL_DEPRECATED(3.2)
-#   define OSSL_DEPRECATEDIN_3_2_FOR(msg)       OSSL_DEPRECATED_FOR(3.2, msg)
+#   define OSSL_DEPRECATEDIN_3_1                OSSL_DEPRECATED(3.1)
+#   define OSSL_DEPRECATEDIN_3_1_FOR(msg)       OSSL_DEPRECATED_FOR(3.1, msg)
 #  else
-#   define OPENSSL_NO_DEPRECATED_3_2
+#   define OPENSSL_NO_DEPRECATED_3_1
 #  endif
 # else
-#  define OSSL_DEPRECATEDIN_3_2
-#  define OSSL_DEPRECATEDIN_3_2_FOR(msg)
+#  define OSSL_DEPRECATEDIN_3_1
+#  define OSSL_DEPRECATEDIN_3_1_FOR(msg)
 # endif
 # if OPENSSL_API_LEVEL >= 30000
 #  ifndef OPENSSL_NO_DEPRECATED