diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-07-31 07:19:06 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-07-31 21:50:14 +0200 |
| commit | bff0f2badc4e692c50757b5632badcba5d94fa04 (patch) | |
| tree | 00ccea60f24e2763d824f3647e9bffebaf4f180a /include | |
| parent | ed4fc85359d40bd06a53af9c8a058b8d3e4e3e39 (diff) | |
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 <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/6824)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/opensslconf.h.in | 10 |
1 files changed, 9 insertions, 1 deletions
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 <openssl/opensslv.h> + #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) |