diff options
| author | Pauli <paul.dale@oracle.com> | 2020-01-13 13:02:45 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-01-19 10:38:49 +1000 |
| commit | da2d32f6db1c9fb33478af660daddcd1df369716 (patch) | |
| tree | e35e8b89a18319fd8444d16a4fe5adad216fb8bc /apps/speed.c | |
| parent | 621f74b3e3eeaa189c9d83dca7352612774ad23c (diff) | |
| download | openssl-da2d32f6db1c9fb33478af660daddcd1df369716.zip openssl-da2d32f6db1c9fb33478af660daddcd1df369716.tar.gz openssl-da2d32f6db1c9fb33478af660daddcd1df369716.tar.bz2 | |
Deprecate the low level IDEA functions.
Use of the low level IDEA functions has been informally discouraged for a
long time. We now formally deprecate them.
Applications should instead use the EVP APIs, e.g. EVP_EncryptInit_ex,
EVP_EncryptUpdate, EVP_EncryptFinal_ex, and the equivalently named decrypt
functions.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10819)
Diffstat (limited to 'apps/speed.c')
| -rw-r--r-- | apps/speed.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/speed.c b/apps/speed.c index dd07527..4883fe0 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -378,7 +378,7 @@ static const OPT_PAIR doit_choices[] = { {"rc5-cbc", D_CBC_RC5}, {"rc5", D_CBC_RC5}, #endif -#ifndef OPENSSL_NO_IDEA +#if !defined(OPENSSL_NO_IDEA) && !defined(OPENSSL_NO_DEPRECATED_3_0) {"idea-cbc", D_CBC_IDEA}, {"idea", D_CBC_IDEA}, #endif @@ -1459,7 +1459,7 @@ int speed_main(int argc, char **argv) #if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0) RC2_KEY rc2_ks; #endif -#ifndef OPENSSL_NO_IDEA +#if !defined(OPENSSL_NO_IDEA) && !defined(OPENSSL_NO_DEPRECATED_3_0) IDEA_KEY_SCHEDULE idea_ks; #endif #if !defined(OPENSSL_NO_SEED) && !defined(OPENSSL_NO_DEPRECATED_3_0) @@ -1969,7 +1969,7 @@ int speed_main(int argc, char **argv) Camellia_set_key(key32, 256, &camellia_ks[2]); } #endif -#ifndef OPENSSL_NO_IDEA +#if !defined(OPENSSL_NO_IDEA) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_IDEA]) IDEA_set_encrypt_key(key16, &idea_ks); #endif @@ -2571,7 +2571,7 @@ int speed_main(int argc, char **argv) } } #endif -#ifndef OPENSSL_NO_IDEA +#if !defined(OPENSSL_NO_IDEA) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_IDEA]) { if (async_jobs > 0) { BIO_printf(bio_err, "Async mode is not supported with %s\n", @@ -3507,7 +3507,7 @@ int speed_main(int argc, char **argv) #ifndef OPENSSL_NO_DEPRECATED_3_0 printf("%s ", AES_options()); #endif -#ifndef OPENSSL_NO_IDEA +#if !defined(OPENSSL_NO_IDEA) && !defined(OPENSSL_NO_DEPRECATED_3_0) printf("%s ", IDEA_options()); #endif #if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0) |