engines: fixed to work with EVP_*_meth calls deprecated

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11082)

diff --git a/build.info b/build.info
index 4ad2b9af37795af4b5658a5a060f956f3bbe587c..1c6787c8008a3b47bdd875c9e11dbe12005969a7 100644 (file)
--- 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 a3e6a690111a7811629f89b20293cda353b11fab..3b48ffb360046a00f5a8a43d7533988457079ad0 100644 (file)
--- 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 0662dcab566bb97e5ece03cd027f7b830827f8a7..cff57d69e8c88fd8df8992ba82b749c73d4e7697 100644 (file)
--- 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 160a07b6413aaa8d8fdefd70f9eeb1df375072e9..729bb1fe955af0fa694a030f26dc089cee48ed4f 100644 (file)
--- 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"