From a9091c137bb21a247afa01ecf17bd5c75d9b0e65 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 12 Jun 2018 18:31:57 +0200 Subject: [PATCH 1/1] 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 (Merged from https://github.com/openssl/openssl/pull/6470) --- crypto/engine/eng_all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { } -- 2.34.1