From: Pauli Date: Wed, 22 Apr 2020 00:38:10 +0000 (+1000) Subject: engines: fixed to work with EVP_*_meth calls deprecated X-Git-Tag: openssl-3.0.0-alpha6~79 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77ae4f6ff7af7d099206a1fc229be7a3ea0e0596;p=thirdparty%2Fopenssl.git engines: fixed to work with EVP_*_meth calls deprecated Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/11082) --- diff --git a/build.info b/build.info index 4ad2b9af377..1c6787c8008 100644 --- a/build.info +++ b/build.info @@ -1,6 +1,10 @@ # Note that some of these directories are filtered in Configure. Look for # %skipdir there for further explanations. -SUBDIRS=crypto ssl apps test util tools fuzz engines providers doc + +SUBDIRS=crypto ssl apps test util tools fuzz providers doc +IF[{- !$disabled{'deprecated-3.0'} -}] + SUBDIRS=engines +ENDIF LIBS=libcrypto libssl INCLUDE[libcrypto]=. include diff --git a/engines/e_afalg.c b/engines/e_afalg.c index a3e6a690111..3b48ffb3600 100644 --- a/engines/e_afalg.c +++ b/engines/e_afalg.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -/* We need to use some engine deprecated APIs */ +/* We need to use some deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED /* Required for vmsplice */ diff --git a/engines/e_capi.c b/engines/e_capi.c index 0662dcab566..cff57d69e8c 100644 --- a/engines/e_capi.c +++ b/engines/e_capi.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -/* We need to use some engine deprecated APIs */ +/* We need to use some deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED #ifdef _WIN32 diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c index 160a07b6413..729bb1fe955 100644 --- a/engines/e_devcrypto.c +++ b/engines/e_devcrypto.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -/* We need to use some engine deprecated APIs */ +/* We need to use some deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED #include "../e_os.h"