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 83710f843199b3ec721d74af213ea66791cde919..64d773acbde0ff91a1fbb3d252c96d8093670ebe 100644 (file)
--- 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 243c0ed7c9bf16ed07a09b00ec2729d4d865bccf..c92e361cde8af3886716ffa16fcdb992559f3051 100644 (file)
--- 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 2062879406cdfebb68f11c628f32e672e7f515f1..63624e9e80a2ac0460c6daf51777df67bcc4c784 100644 (file)
--- 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 9bee9cb3af31f6a11de3eb771bd66995a3a9b120..d7722d76e057040e5ea721c1cf1a96256961d567 100644 (file)
--- 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>