diff options
| author | Pauli <paul.dale@oracle.com> | 2020-07-14 01:38:22 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-07-16 09:12:27 +0200 |
| commit | cf8e8cba93776cda9a137232df58a17d7c9a8fc1 (patch) | |
| tree | 7a529b78ee0f2624840f8111669393ed71cc33e2 | |
| parent | Fix indentation for engine.h (diff) | |
| download | openssl-cf8e8cba93776cda9a137232df58a17d7c9a8fc1.tar.xz openssl-cf8e8cba93776cda9a137232df58a17d7c9a8fc1.zip | |
deprecate engines
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12226)
Diffstat (limited to '')
| -rw-r--r-- | engines/e_afalg.c | 3 | ||||
| -rw-r--r-- | engines/e_capi.c | 3 | ||||
| -rw-r--r-- | engines/e_dasync.c | 3 | ||||
| -rw-r--r-- | engines/e_devcrypto.c | 3 | ||||
| -rw-r--r-- | engines/e_ossltest.c | 3 | ||||
| -rw-r--r-- | engines/e_padlock.c | 4 |
6 files changed, 17 insertions, 2 deletions
diff --git a/engines/e_afalg.c b/engines/e_afalg.c index c644fa15a2..a3e6a69011 100644 --- 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 4ac559026a..0662dcab56 100644 --- 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 34936b5fe6..b817b2ba5f 100644 --- 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 489109a80d..e8d5d5dd5a 100644 --- 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 6b5fb561a0..df2a3e14e8 100644 --- 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 af5ac24a21..713a79a368 100644 --- 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 |