From bff0f2badc4e692c50757b5632badcba5d94fa04 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 31 Jul 2018 07:19:06 +0200 Subject: [PATCH] Ensure symbols don't get deprecated too early There are symbols we've marked for deprecation in OpenSSL 1.2.0. We must ensure that they don't actually become deprecated before that. Fixes #6814 Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/6824) --- include/openssl/opensslconf.h.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index b793d482c7..bc98cad51a 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -9,6 +9,8 @@ * https://www.openssl.org/source/license.html */ +#include + #ifdef __cplusplus extern "C" { #endif @@ -97,7 +99,13 @@ extern "C" { # define OPENSSL_API_COMPAT OPENSSL_MIN_API #endif -#if OPENSSL_API_COMPAT < 0x10200000L +/* + * Do not deprecate things to be deprecated in version 1.2.0 before the + * OpenSSL version number matches. + */ +#if OPENSSL_VERSION_NUMBER < 0x10200000L +# define DEPRECATEDIN_1_2_0(f) f; +#elif OPENSSL_API_COMPAT < 0x10200000L # define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) #else # define DEPRECATEDIN_1_2_0(f) -- 2.25.1