From: Richard Levitte <levitte@openssl.org>
Date: Tue, 12 Jun 2018 16:31:57 +0000 (+0200)
Subject: Convert our own check of OPENSSL_NO_DEPRECATED
X-Git-Tag: OpenSSL_1_1_1-pre8~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a9091c137bb21a247afa01ecf17bd5c75d9b0e65;p=oweals%2Fopenssl.git

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 <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6470)
---

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index c0d0b1cb07..5f06fe0b60 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)
 {
 }