diff options
author | Matt Caswell <matt@openssl.org> | 2020-01-02 16:15:26 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2020-01-13 13:44:27 +0000 |
commit | 0ae5d4d6f8a0cd17fb9beb5876827f311c1b350c (patch) | |
tree | 97e4560467f8b8d9b997b8ac0dd1f45029964b8c /apps/speed.c | |
parent | 291850b473ef5d83ac7d90bdcd7f68d186515348 (diff) |
Deprecate the Low Level CAST APIs
Applications should instead use the higher level EVP APIs, e.g.
EVP_Encrypt*() and EVP_Decrypt*().
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10742)
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 bb57da9c85..67bf650ec2 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -389,7 +389,7 @@ static const OPT_PAIR doit_choices[] = { {"blowfish", D_CBC_BF}, {"bf", D_CBC_BF}, #endif -#ifndef OPENSSL_NO_CAST +#if !defined(OPENSSL_NO_CAST) && !defined(OPENSSL_NO_DEPRECATED_3_0) {"cast-cbc", D_CBC_CAST}, {"cast", D_CBC_CAST}, {"cast5", D_CBC_CAST}, @@ -1464,7 +1464,7 @@ int speed_main(int argc, char **argv) #if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0) BF_KEY bf_ks; #endif -#ifndef OPENSSL_NO_CAST +#if !defined(OPENSSL_NO_CAST) && !defined(OPENSSL_NO_DEPRECATED_3_0) CAST_KEY cast_ks; #endif static const unsigned char key16[16] = { @@ -1992,7 +1992,7 @@ int speed_main(int argc, char **argv) if (doit[D_CBC_BF]) BF_set_key(&bf_ks, 16, key16); #endif -#ifndef OPENSSL_NO_CAST +#if !defined(OPENSSL_NO_CAST) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_CAST]) CAST_set_key(&cast_ks, 16, key16); #endif @@ -2672,7 +2672,7 @@ int speed_main(int argc, char **argv) } } #endif -#ifndef OPENSSL_NO_CAST +#if !defined(OPENSSL_NO_CAST) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_CAST]) { if (async_jobs > 0) { BIO_printf(bio_err, "Async mode is not supported with %s\n", |