deprecate engines in libcrypto

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

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 8c7df51fe41fd55f0fbaf71477857d43ce992444..32074c460eac32d7a21261e58f703f18f6aaa1c0 100644 (file)
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.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"               /* for strncasecmp */
 #include "internal/cryptlib.h"
 #include <stdio.h>

diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 3ddc56d4082058c909148066a4cb5ab57984f646..a4d240e7c4513c78e702e1083bbf688a7d25dd43 100644 (file)
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.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 "internal/cryptlib.h"
 #include <openssl/bn.h>

diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c
index 033c1ada189212dbf098fbcd0c3e57b866efc71f..9852f0212e1aa2ef146c77e0d7f53baa7d28176f 100644 (file)
--- a/crypto/conf/conf_mall.c
+++ b/crypto/conf/conf_mall.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 <openssl/crypto.h>
 #include "internal/cryptlib.h"

diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index 9d3db8eb31b1fb009e4af71628d907b2fcb8470b..64473417e9e3039f861ef53700b8a014f4c826c7 100644 (file)
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.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 "internal/cryptlib.h"
 #include <stdio.h>
 #include <ctype.h>

diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c
index 0ddad7dd806ab61e0f5058a6858f938ac70016fd..dcc30b6c622933dc6a1619a0af0adc05aa9e05b2 100644 (file)
--- a/crypto/engine/eng_cnf.c
+++ b/crypto/engine/eng_cnf.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 "eng_local.h"
 #include <openssl/conf.h>
 #include <openssl/trace.h>

diff --git a/crypto/engine/eng_ctrl.c b/crypto/engine/eng_ctrl.c
index 39cfb17089d66e61cd069c99421fae57ffe7f5cf..1cc4f545afbb0dee34c7d23b38f392c27cdcb4e3 100644 (file)
--- a/crypto/engine/eng_ctrl.c
+++ b/crypto/engine/eng_ctrl.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 "eng_local.h"
 
 /*

diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c
index 798ff1e3af50c32175487fb34bd19ae05221dc34..73d7b14ae6944bbd9f1b1802ba1f14796b58aa03 100644 (file)
--- a/crypto/engine/eng_dyn.c
+++ b/crypto/engine/eng_dyn.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 "eng_local.h"
 #include "internal/dso.h"
 #include <openssl/crypto.h>

diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index 428e66733b80f65e6a132d8e50f603120b2a0ad8..e0de95d11b72487f06c89d7659ba51aec71820e6 100644 (file)
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.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 "eng_local.h"
 #include <openssl/conf.h>
 

diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
index 34f01388a2d90e4e311f9f11ab95141bee388e49..7303426e812e84ca701192b1f20e44eab17691e0 100644 (file)
--- a/crypto/engine/eng_init.c
+++ b/crypto/engine/eng_init.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 "eng_local.h"
 

diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index 167c24cb23d244b46d6c14a6ac29aa028180a2e5..cb9ad78838f59ed26cbb7107dccf272fbfdda6fe 100644 (file)
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.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 "eng_local.h"
 
 /*

diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index 8b2b8c1ff446e9d5c165eb850156d29232b7aece..32e6f4e19fe2ecfa2da5e71f185075c8f1322df1 100644 (file)
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -8,6 +8,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* We need to use some engine deprecated APIs */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
 /*
  * RC4 and SHA-1 low level APIs are deprecated for public use, but still ok
  * for internal use.

diff --git a/crypto/engine/eng_pkey.c b/crypto/engine/eng_pkey.c
index b8853df1cfccc87d112b5a9f9e5051f146b4e8dd..68df415475ed6dbef1eeb6dcae1c00b05ef0583b 100644 (file)
--- a/crypto/engine/eng_pkey.c
+++ b/crypto/engine/eng_pkey.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 "eng_local.h"
 
 /* Basic get/set stuff */

diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c
index b6d1988d13b1e732ceb009af88df64ab922a0545..53cd34fb28842253ce19e6b718549464f6daa9cd 100644 (file)
--- a/crypto/engine/eng_rdrand.c
+++ b/crypto/engine/eng_rdrand.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 <stdio.h>

diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index 6289c225a53b0f7bf5a205bfeaa8e05fbddb836a..3aad4e8d1c71d35c4ff362d97ed9809363a99770 100644 (file)
--- a/crypto/engine/tb_asnmth.c
+++ b/crypto/engine/tb_asnmth.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 "eng_local.h"
 #include <openssl/evp.h>

diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c
index c669907a53df5c05468904c1600343cf42c4a852..bc97deda87e14390e6046f9831901e73f5458de5 100644 (file)
--- a/crypto/engine/tb_cipher.c
+++ b/crypto/engine/tb_cipher.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 "eng_local.h"
 
 static ENGINE_TABLE *cipher_table = NULL;

diff --git a/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c
index e877fce2fcce97a7bac8a71ca95391d8807337a2..fa8b5b846be050247da3f99606e90b3df5a577fb 100644 (file)
--- a/crypto/engine/tb_dh.c
+++ b/crypto/engine/tb_dh.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 "eng_local.h"
 
 static ENGINE_TABLE *dh_table = NULL;

diff --git a/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c
index 8a5a8332a9d9bc8ada4fdb0ce0b1c8140b7cc8f6..5e75e64e6918933e0c96ef3fa35c3e6bf44e2c11 100644 (file)
--- a/crypto/engine/tb_digest.c
+++ b/crypto/engine/tb_digest.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 "eng_local.h"
 
 static ENGINE_TABLE *digest_table = NULL;

diff --git a/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c
index a22e8f6941094172ac783d972a4b948f08411822..65dbe64df98b417f3297ade0f69060a163233051 100644 (file)
--- a/crypto/engine/tb_dsa.c
+++ b/crypto/engine/tb_dsa.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 "eng_local.h"
 
 static ENGINE_TABLE *dsa_table = NULL;

diff --git a/crypto/engine/tb_eckey.c b/crypto/engine/tb_eckey.c
index 397dad8855b7625ca7e288737b263c159639e1ed..ae7ef5ebdf29456eda6390fcc38e88603247301a 100644 (file)
--- a/crypto/engine/tb_eckey.c
+++ b/crypto/engine/tb_eckey.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 "eng_local.h"
 
 static ENGINE_TABLE *dh_table = NULL;

diff --git a/crypto/engine/tb_pkmeth.c b/crypto/engine/tb_pkmeth.c
index beb4fd7371e814121a0bbd4536eebc2098456866..2d0cbff4973baae27a6e6ccf3b097eebc614d9b1 100644 (file)
--- a/crypto/engine/tb_pkmeth.c
+++ b/crypto/engine/tb_pkmeth.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 "eng_local.h"
 #include <openssl/evp.h>
 

diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c
index d7c7ef485fc53659aeb31305087869b96545ac8a..9996cf67d636002d2751bedb5f01204db25c15ee 100644 (file)
--- a/crypto/engine/tb_rand.c
+++ b/crypto/engine/tb_rand.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 "eng_local.h"
 
 static ENGINE_TABLE *rand_table = NULL;

diff --git a/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c
index 5b7d6717ae6528ec70db6d739cccf5836400384a..35f6c68e5493d26ef80c9d066bb1f4cf95cf10b1 100644 (file)
--- a/crypto/engine/tb_rsa.c
+++ b/crypto/engine/tb_rsa.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 "eng_local.h"
 
 static ENGINE_TABLE *rsa_table = NULL;

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 92e9b7bfb0dd2af270d875b98f53c61f650cd1dc..3d25b75be770851f8d785fd6d0e2cc328b04aabb 100644 (file)
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.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 <openssl/objects.h>
 #include <openssl/evp.h>

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index ec966a0ed5f6ba3900134b58b39ef4bc4fc3be5a..b8cb5daad044dc5ccbc1fbd18ca63c69ceb6e441 100644 (file)
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.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 <assert.h>
 #include "internal/cryptlib.h"

diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c
index 55badea7e91782204650e4282421f8341923d7a7..784fca956d784370474fabaa148dd974e9dfcc03 100644 (file)
--- a/crypto/evp/pkey_mac.c
+++ b/crypto/evp/pkey_mac.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/err.h>
 #include <openssl/evp.h>

diff --git a/crypto/init.c b/crypto/init.c
index 4aa3fc83da91495abd4d80082c5afbfd80adcdbe..8c1fc2598faac5745aeda108e16fab8afc7e49a3 100644 (file)
--- a/crypto/init.c
+++ b/crypto/init.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 "crypto/cryptlib.h"
 #include <openssl/err.h>

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index bd20bbb783b7c44aa6146b95543de739301b402c..71074b5b165e87dc2b14e45b1f7e5f662c1859df 100644 (file)
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.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 "crypto/ctype.h"
 #include <string.h>

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index e7dfb07de21466e07f633f84fcd4562eaba8ff09..d43b4fb8dbb6986231e761b5a66a2914ee74c142 100644 (file)
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.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 <time.h>
 #include "internal/cryptlib.h"

diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c
index 9a2ada335d240ffc6fe73608ed4f104f03234ab1..30f4e6ecaf86f76de86c841bacbdde632741d3e9 100644 (file)
--- a/crypto/store/loader_file.c
+++ b/crypto/store/loader_file.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/stat.h>

diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c
index 9044920e3f71f4369ba4d56fdfb2a37e29deaa48..199a3b82e3728c772857699677814221c3583c19 100644 (file)
--- a/crypto/ts/ts_conf.c
+++ b/crypto/ts/ts_conf.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/crypto.h>