diff options
| author | Pauli <paul.dale@oracle.com> | 2020-01-14 10:33:03 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-01-16 07:07:27 +1000 |
| commit | 62c3fed0cd52316259e4e2c0e5878bcfa69b38f9 (patch) | |
| tree | 72dd00534999ea41ab76b23b3271a95c1222ac45 /apps | |
| parent | 26aae51347465764c755f0985bd1ac85d3f734e6 (diff) | |
Deprecate the low level RC5 functions
Use of the low level RC5 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')
| -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 f567b48d2e..d741f315e2 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -372,7 +372,7 @@ static const OPT_PAIR doit_choices[] = { {"rc2-cbc", D_CBC_RC2}, {"rc2", D_CBC_RC2}, #endif -#ifndef OPENSSL_NO_RC5 +#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0) {"rc5-cbc", D_CBC_RC5}, {"rc5", D_CBC_RC5}, #endif @@ -1449,7 +1449,7 @@ int speed_main(int argc, char **argv) EdDSA_SECONDS, SM2_SECONDS }; /* What follows are the buffers and key material. */ -#ifndef OPENSSL_NO_RC5 +#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0) RC5_32_KEY rc5_ks; #endif #if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0) @@ -1981,7 +1981,7 @@ int speed_main(int argc, char **argv) if (doit[D_CBC_RC2]) RC2_set_key(&rc2_ks, 16, key16, 128); #endif -#ifndef OPENSSL_NO_RC5 +#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_RC5]) if (!RC5_32_set_key(&rc5_ks, 16, key16, 12)) { BIO_printf(bio_err, "Failed setting RC5 key\n"); @@ -2628,7 +2628,7 @@ int speed_main(int argc, char **argv) } } #endif -#ifndef OPENSSL_NO_RC5 +#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_RC5]) { if (async_jobs > 0) { BIO_printf(bio_err, "Async mode is not supported with %s\n", |