diff options
| author | Pauli <paul.dale@oracle.com> | 2020-01-14 09:15:18 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-01-16 07:07:27 +1000 |
| commit | ee2993abd0830ec27a2dd49e07db8d0eb5f3e579 (patch) | |
| tree | 9c789bbe5b362cc30edaacac00ca8acd21c58f69 /apps/speed.c | |
| parent | 49742fd412665d2211523ac2925640e3be9d9ab3 (diff) | |
Deprecate the low level RC2 functions
Use of the low level RC2 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/10834)
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 ef14ad6380..ae02393dd1 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -368,7 +368,7 @@ static const OPT_PAIR doit_choices[] = { {"aes-192-ige", D_IGE_192_AES}, {"aes-256-ige", D_IGE_256_AES}, #endif -#ifndef OPENSSL_NO_RC2 +#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0) {"rc2-cbc", D_CBC_RC2}, {"rc2", D_CBC_RC2}, #endif @@ -1452,7 +1452,7 @@ int speed_main(int argc, char **argv) #ifndef OPENSSL_NO_RC5 RC5_32_KEY rc5_ks; #endif -#ifndef OPENSSL_NO_RC2 +#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0) RC2_KEY rc2_ks; #endif #ifndef OPENSSL_NO_IDEA @@ -1977,7 +1977,7 @@ int speed_main(int argc, char **argv) if (doit[D_RC4]) RC4_set_key(&rc4_ks, 16, key16); #endif -#ifndef OPENSSL_NO_RC2 +#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_RC2]) RC2_set_key(&rc2_ks, 16, key16, 128); #endif @@ -2604,7 +2604,7 @@ int speed_main(int argc, char **argv) } } #endif -#ifndef OPENSSL_NO_RC2 +#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_RC2]) { if (async_jobs > 0) { BIO_printf(bio_err, "Async mode is not supported with %s\n", |