diff options
| author | Matt Caswell <matt@openssl.org> | 2020-01-02 15:22:19 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-01-13 13:38:20 +0000 |
| commit | 291850b473ef5d83ac7d90bdcd7f68d186515348 (patch) | |
| tree | dc0e82c3982d8b6a83eda65abdd14b8e7ee829e6 /apps | |
| parent | 652fba9ef74c1fe92b80d178ada419057d873682 (diff) | |
Deprecate Low Level Camellia APIs
Applications should instead use the higher level EVP APIs, e.g.
EVP_Encrypt*() and EVP_Decrypt*().
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10741)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/speed.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/speed.c b/apps/speed.c index 5b87293123..bb57da9c85 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1471,6 +1471,7 @@ int speed_main(int argc, char **argv) 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12 }; +#ifndef OPENSSL_NO_DEPRECATED_3_0 static const unsigned char key24[24] = { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, @@ -1482,7 +1483,8 @@ int speed_main(int argc, char **argv) 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56 }; -#ifndef OPENSSL_NO_CAMELLIA +#endif +#if !defined(OPENSSL_NO_CAMELLIA) && !defined(OPENSSL_NO_DEPRECATED_3_0) CAMELLIA_KEY camellia_ks[3]; #endif #ifndef OPENSSL_NO_RSA @@ -1758,7 +1760,7 @@ int speed_main(int argc, char **argv) continue; } #endif -#ifndef OPENSSL_NO_CAMELLIA +#if !defined(OPENSSL_NO_CAMELLIA) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (strcmp(algo, "camellia") == 0) { doit[D_CBC_128_CML] = doit[D_CBC_192_CML] = doit[D_CBC_256_CML] = 1; continue; @@ -1956,7 +1958,7 @@ int speed_main(int argc, char **argv) AES_set_encrypt_key(key24, 192, &aes_ks2); AES_set_encrypt_key(key32, 256, &aes_ks3); #endif -#ifndef OPENSSL_NO_CAMELLIA +#if !defined(OPENSSL_NO_CAMELLIA) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_128_CML] || doit[D_CBC_192_CML] || doit[D_CBC_256_CML]) { Camellia_set_key(key16, 128, &camellia_ks[0]); Camellia_set_key(key24, 192, &camellia_ks[1]); @@ -2503,7 +2505,7 @@ int speed_main(int argc, char **argv) CRYPTO_gcm128_release(loopargs[i].gcm_ctx); } #endif /* OPENSSL_NO_DEPRECATED_3_0 */ -#ifndef OPENSSL_NO_CAMELLIA +#if !defined(OPENSSL_NO_CAMELLIA) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_128_CML]) { if (async_jobs > 0) { BIO_printf(bio_err, "Async mode is not supported with %s\n", |