deprecate engines

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

diff --git a/engines/e_afalg.c b/engines/e_afalg.c
index c644fa15a242a6dd5e598c0de7fb94205c630b30..a3e6a690111a7811629f89b20293cda353b11fab 100644 (file)
--- a/engines/e_afalg.c
+++ b/engines/e_afalg.c
@@ -7,6 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 /* Required for vmsplice */
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE

diff --git a/engines/e_capi.c b/engines/e_capi.c
index 4ac559026a1a7681a3a449a408f960b97ad8359d..0662dcab566bb97e5ece03cd027f7b830827f8a7 100644 (file)
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -7,6 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 #ifdef _WIN32
 # ifndef _WIN32_WINNT
 #  define _WIN32_WINNT 0x0400

diff --git a/engines/e_dasync.c b/engines/e_dasync.c
index 34936b5fe62062bc067f232df7b5e6338fccbbbd..b817b2ba5f5d2bb66129062e9ea531f5bbaae2ab 100644 (file)
--- a/engines/e_dasync.c
+++ b/engines/e_dasync.c
@@ -7,6 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 /*
  * SHA-1 low level APIs are deprecated for public use, but still ok for
  * internal use.  Note, that due to symbols not being exported, only the

diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
index 489109a80df1fad6737fa7554f0efe3a9fa1e006..e8d5d5dd5a5526df76a0e1952e87cba1f0286aee 100644 (file)
--- a/engines/e_devcrypto.c
+++ b/engines/e_devcrypto.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 "../e_os.h"
 #include <string.h>
 #include <sys/types.h>

diff --git a/engines/e_ossltest.c b/engines/e_ossltest.c
index 6b5fb561a0cfcd077166ca5469bea2b8a7ea4323..df2a3e14e83378197629477651103793a3ca6df2 100644 (file)
--- a/engines/e_ossltest.c
+++ b/engines/e_ossltest.c
@@ -13,6 +13,9 @@
  * used for any purpose except testing
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 /*
  * SHA low level APIs are deprecated for public use, but still ok for
  * internal use.  Note, that due to symbols not being exported, only the

diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index af5ac24a21da8c49c718e7fc934552ef88aa0abf..713a79a36812de01c842a0d56c7be20f1809cde7 100644 (file)
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -8,8 +8,8 @@
  */
 
 /*
- * This file uses the low level AES functions (which are deprecated for
- * non-internal use) in order to implement the padlock engine AES ciphers.
+ * This file uses the low level AES and engine functions (which are deprecated
+ * for non-internal use) in order to implement the padlock engine AES ciphers.
  */
 #define OPENSSL_SUPPRESS_DEPRECATED