From: Pauli <paul.dale@oracle.com>
Date: Mon, 13 Jul 2020 23:38:42 +0000 (+1000)
Subject: deprecate engines in SSL
X-Git-Tag: openssl-3.0.0-alpha5~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92f8603537d5e883588163e04396779edb21a0b7;p=thirdparty%2Fopenssl.git

deprecate engines in SSL

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

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 83710f84319..64d773acbde 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -9,6 +9,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include <stdio.h>
 #include <ctype.h>
 #include <openssl/objects.h>
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 243c0ed7c9b..c92e361cde8 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -9,6 +9,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include <stdio.h>
 #include "ssl_local.h"
 #include "e_os.h"
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 2062879406c..63624e9e80a 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.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 <stdio.h>
 #include <openssl/rand.h>
 #include <openssl/engine.h>
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 9bee9cb3af3..d7722d76e05 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -9,6 +9,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #include <stdio.h>
 #include <time.h>
 #include <assert.h>