The branch master has been updated via a9091c137bb21a247afa01ecf17bd5c75d9b0e65 (commit) via 973abf52304b454e8f2220a11aa8b6c6512c44fb (commit) from 575045f59fc393abc9d49604d82ccd17c82925fa (commit)
- Log ----------------------------------------------------------------- commit a9091c137bb21a247afa01ecf17bd5c75d9b0e65 Author: Richard Levitte <levi...@openssl.org> Date: Tue Jun 12 18:31:57 2018 +0200 Convert our own check of OPENSSL_NO_DEPRECATED ... to the check OPENSSL_API_COMPAT < 0x10100000L, to correspond with how it's declared. Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6470) commit 973abf52304b454e8f2220a11aa8b6c6512c44fb Author: Richard Levitte <levi...@openssl.org> Date: Tue Jun 12 18:26:37 2018 +0200 Configure option 'no-deprecated' means '-DOPENSSL_API_COMPAT=0x10100000L' (that is, until 1.2.0 comes along) Since we allow future deprecation (and that shouldn't be affected by 'no-deprecated'), we need to distinguish what to have deprecated on the value of OPENSSL_API_COMPAT, not the existence of OPENSSL_NO_DEPRECATED. Note that the macro OPENSSL_NO_DEPRECATED still exists, in case someone still uses it. Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6470) ----------------------------------------------------------------------- Summary of changes: crypto/engine/eng_all.c | 2 +- include/openssl/opensslconf.h.in | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c index c0d0b1c..5f06fe0 100644 --- a/crypto/engine/eng_all.c +++ b/crypto/engine/eng_all.c @@ -18,7 +18,7 @@ void ENGINE_load_builtin_engines(void) OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL); } -#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)) && !defined(OPENSSL_NO_DEPRECATED) +#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)) && OPENSSL_API_COMPAT < 0x10100000L void ENGINE_setup_bsd_cryptodev(void) { } diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index dc36a74..96f791e 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -68,9 +68,7 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if defined(OPENSSL_NO_DEPRECATED) -# define DECLARE_DEPRECATED(f) -#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); #else # define DECLARE_DEPRECATED(f) f; _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits