From e4468e6d8dc5a8a7e49f2ba77ed55ce2b282d4a7 Mon Sep 17 00:00:00 2001 From: Pauli Date: Tue, 14 Jul 2020 09:40:29 +1000 Subject: deprecate engines in libcrypto Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/12226) --- crypto/asn1/ameth_lib.c | 3 +++ crypto/asn1/d2i_pr.c | 3 +++ crypto/conf/conf_mall.c | 3 +++ crypto/conf/conf_mod.c | 3 +++ crypto/engine/eng_cnf.c | 3 +++ crypto/engine/eng_ctrl.c | 3 +++ crypto/engine/eng_dyn.c | 3 +++ crypto/engine/eng_fat.c | 3 +++ crypto/engine/eng_init.c | 3 +++ crypto/engine/eng_list.c | 3 +++ crypto/engine/eng_openssl.c | 3 +++ crypto/engine/eng_pkey.c | 3 +++ crypto/engine/eng_rdrand.c | 3 +++ crypto/engine/tb_asnmth.c | 3 +++ crypto/engine/tb_cipher.c | 3 +++ crypto/engine/tb_dh.c | 3 +++ crypto/engine/tb_digest.c | 3 +++ crypto/engine/tb_dsa.c | 3 +++ crypto/engine/tb_eckey.c | 3 +++ crypto/engine/tb_pkmeth.c | 3 +++ crypto/engine/tb_rand.c | 3 +++ crypto/engine/tb_rsa.c | 3 +++ crypto/evp/digest.c | 3 +++ crypto/evp/evp_enc.c | 3 +++ crypto/evp/pkey_mac.c | 3 +++ crypto/init.c | 3 +++ crypto/pem/pem_lib.c | 3 +++ crypto/rand/rand_lib.c | 3 +++ crypto/store/loader_file.c | 3 +++ crypto/ts/ts_conf.c | 3 +++ 30 files changed, 90 insertions(+) diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index 8c7df51fe4..32074c460e 100644 --- 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 diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index 3ddc56d408..a4d240e7c4 100644 --- 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 #include "internal/cryptlib.h" #include diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c index 033c1ada18..9852f0212e 100644 --- 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 #include #include "internal/cryptlib.h" diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index 9d3db8eb31..64473417e9 100644 --- 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 #include diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c index 0ddad7dd80..dcc30b6c62 100644 --- 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 #include diff --git a/crypto/engine/eng_ctrl.c b/crypto/engine/eng_ctrl.c index 39cfb17089..1cc4f545af 100644 --- 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 798ff1e3af..73d7b14ae6 100644 --- 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 diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c index 428e66733b..e0de95d11b 100644 --- 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 diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c index 34f01388a2..7303426e81 100644 --- 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 167c24cb23..cb9ad78838 100644 --- 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 8b2b8c1ff4..32e6f4e19f 100644 --- 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 b8853df1cf..68df415475 100644 --- 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 b6d1988d13..53cd34fb28 100644 --- 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 #include diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c index 6289c225a5..3aad4e8d1c 100644 --- 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 diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c index c669907a53..bc97deda87 100644 --- 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 e877fce2fc..fa8b5b846b 100644 --- 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 8a5a8332a9..5e75e64e69 100644 --- 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 a22e8f6941..65dbe64df9 100644 --- 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 397dad8855..ae7ef5ebdf 100644 --- 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 beb4fd7371..2d0cbff497 100644 --- 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 diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c index d7c7ef485f..9996cf67d6 100644 --- 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 5b7d6717ae..35f6c68e54 100644 --- 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 92e9b7bfb0..3d25b75be7 100644 --- 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 #include #include diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index ec966a0ed5..b8cb5daad0 100644 --- 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 #include #include "internal/cryptlib.h" diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c index 55badea7e9..784fca956d 100644 --- 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 #include #include diff --git a/crypto/init.c b/crypto/init.c index 4aa3fc83da..8c1fc2598f 100644 --- 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 diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index bd20bbb783..71074b5b16 100644 --- 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 #include "crypto/ctype.h" #include diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index e7dfb07de2..d43b4fb8db 100644 --- 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 #include #include "internal/cryptlib.h" diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c index 9a2ada335d..30f4e6ecaf 100644 --- 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 #include diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c index 9044920e3f..199a3b82e3 100644 --- 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 #include -- cgit v1.2.3