From: Pauli <paul.dale@oracle.com>
Date: Mon, 13 Jul 2020 23:40:04 +0000 (+1000)
Subject: apps: deprecate engines
X-Git-Tag: openssl-3.0.0-alpha5~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad8fc6f626a6f9064383d77b102c8efcf442a9d7;p=thirdparty%2Fopenssl.git

apps: deprecate engines

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

diff --git a/apps/engine.c b/apps/engine.c
index 6d788ac8524..d51586d8550 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -7,6 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include <openssl/opensslconf.h>
 
 #include "apps.h"
diff --git a/apps/genpkey.c b/apps/genpkey.c
index 4a4a83fd40a..17fb42eba6e 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -7,6 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include <stdio.h>
 #include <string.h>
 #include "apps.h"
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 3e4cc288b15..777e4fed356 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -7,6 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
 /*
  * On VMS, you need to define this to get the declaration of fileno().  The
diff --git a/apps/list.c b/apps/list.c
index 52641e41cb8..f0ea7dc6aea 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -7,6 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include <string.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
diff --git a/apps/req.c b/apps/req.c
index a2212b988d8..4ae828cd456 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -7,6 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/apps/s_client.c b/apps/s_client.c
index 91b21003fb2..a1b80f4c5f0 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -8,6 +8,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include "e_os.h"
 #include <ctype.h>
 #include <stdio.h>