diff options
author | Pauli <paul.dale@oracle.com> | 2020-07-14 09:40:29 +1000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-07-16 09:12:27 +0200 |
commit | e4468e6d8dc5a8a7e49f2ba77ed55ce2b282d4a7 (patch) | |
tree | c872cfc97668904b3ccf5b9f0c5df440d21a7757 /crypto/engine | |
parent | ad8fc6f626a6f9064383d77b102c8efcf442a9d7 (diff) |
deprecate engines in libcrypto
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
Diffstat (limited to 'crypto/engine')
-rw-r--r-- | crypto/engine/eng_cnf.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_ctrl.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_dyn.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_fat.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_init.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_list.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_openssl.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_pkey.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_rdrand.c | 3 | ||||
-rw-r--r-- | crypto/engine/tb_asnmth.c | 3 | ||||
-rw-r--r-- | crypto/engine/tb_cipher.c | 3 | ||||
-rw-r--r-- | crypto/engine/tb_dh.c | 3 | ||||
-rw-r--r-- | crypto/engine/tb_digest.c | 3 | ||||
-rw-r--r-- | crypto/engine/tb_dsa.c | 3 | ||||
-rw-r--r-- | crypto/engine/tb_eckey.c | 3 | ||||
-rw-r--r-- | crypto/engine/tb_pkmeth.c | 3 | ||||
-rw-r--r-- | crypto/engine/tb_rand.c | 3 | ||||
-rw-r--r-- | crypto/engine/tb_rsa.c | 3 |
18 files changed, 54 insertions, 0 deletions
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 <openssl/conf.h> #include <openssl/trace.h> 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 <openssl/crypto.h> 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 <openssl/conf.h> 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 <openssl/opensslconf.h> #include <stdio.h> 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 <openssl/evp.h> 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 <openssl/evp.h> 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; |