diff options
| author | Pauli <paul.dale@oracle.com> | 2020-01-14 08:35:12 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-01-16 07:06:14 +1000 |
| commit | 28c690cb7dd80c15c9fa45df518c555c66ad67f8 (patch) | |
| tree | cfd80c4bca2f1d903826b432a312c13eefe79bc4 /apps/speed.c | |
| parent | fb8ce41398bae4e0b1fdba03a281b93daddc9eaf (diff) | |
Deprecate the low level SEED functions
Use of the low level SEED 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: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10833)
Diffstat (limited to 'apps/speed.c')
| -rw-r--r-- | apps/speed.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/speed.c b/apps/speed.c index 67bf650ec2..ef14ad6380 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -380,7 +380,7 @@ static const OPT_PAIR doit_choices[] = { {"idea-cbc", D_CBC_IDEA}, {"idea", D_CBC_IDEA}, #endif -#ifndef OPENSSL_NO_SEED +#if !defined(OPENSSL_NO_SEED) && !defined(OPENSSL_NO_DEPRECATED_3_0) {"seed-cbc", D_CBC_SEED}, {"seed", D_CBC_SEED}, #endif @@ -1458,7 +1458,7 @@ int speed_main(int argc, char **argv) #ifndef OPENSSL_NO_IDEA IDEA_KEY_SCHEDULE idea_ks; #endif -#ifndef OPENSSL_NO_SEED +#if !defined(OPENSSL_NO_SEED) && !defined(OPENSSL_NO_DEPRECATED_3_0) SEED_KEY_SCHEDULE seed_ks; #endif #if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0) @@ -1969,7 +1969,7 @@ int speed_main(int argc, char **argv) if (doit[D_CBC_IDEA]) IDEA_set_encrypt_key(key16, &idea_ks); #endif -#ifndef OPENSSL_NO_SEED +#if !defined(OPENSSL_NO_SEED) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_SEED]) SEED_set_key(key16, &seed_ks); #endif @@ -2585,7 +2585,7 @@ int speed_main(int argc, char **argv) } } #endif -#ifndef OPENSSL_NO_SEED +#if !defined(OPENSSL_NO_SEED) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_SEED]) { if (async_jobs > 0) { BIO_printf(bio_err, "Async mode is not supported with %s\n", |