summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2020-04-22 10:38:10 +1000
committerPauli <paul.dale@oracle.com>2020-07-22 20:19:01 +1000
commit77ae4f6ff7af7d099206a1fc229be7a3ea0e0596 (patch)
tree276f30b70644fefe220ed8b7f8a7c7a0ef308924
parent9e5f344a87f08ee2f3886fbccba1957bca86e7ef (diff)
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)
-rw-r--r--build.info6
-rw-r--r--engines/e_afalg.c2
-rw-r--r--engines/e_capi.c2
-rw-r--r--engines/e_devcrypto.c2
4 files changed, 8 insertions, 4 deletions
diff --git a/build.info b/build.info
index 4ad2b9af37..1c6787c800 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 a3e6a69011..3b48ffb360 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 0662dcab56..cff57d69e8 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 160a07b641..729bb1fe95 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"