diff options
| author | Matt Caswell <matt@openssl.org> | 2020-01-02 14:25:27 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-01-08 11:25:25 +0000 |
| commit | 03047e7b7f64b054fa85d101e7097af5daf7a865 (patch) | |
| tree | 38c18f72c1a38605c1dcf885d8b25df45e161ef8 /apps | |
| parent | 339638b586e77c189e8294f931b99b03d1f08dbd (diff) | |
Deprecate Low Level Blowfish APIs
Applications should instead use the higher level EVP APIs, e.g.
EVP_Encrypt*() and EVP_Decrypt*().
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10740)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/speed.c | 10 | ||||
| -rw-r--r-- | apps/version.c | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/apps/speed.c b/apps/speed.c index 3e09d8ddcb..861140c4fb 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -384,7 +384,7 @@ static const OPT_PAIR doit_choices[] = { {"seed-cbc", D_CBC_SEED}, {"seed", D_CBC_SEED}, #endif -#ifndef OPENSSL_NO_BF +#if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0) {"bf-cbc", D_CBC_BF}, {"blowfish", D_CBC_BF}, {"bf", D_CBC_BF}, @@ -1461,7 +1461,7 @@ int speed_main(int argc, char **argv) #ifndef OPENSSL_NO_SEED SEED_KEY_SCHEDULE seed_ks; #endif -#ifndef OPENSSL_NO_BF +#if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0) BF_KEY bf_ks; #endif #ifndef OPENSSL_NO_CAST @@ -1986,7 +1986,7 @@ int speed_main(int argc, char **argv) goto end; } #endif -#ifndef OPENSSL_NO_BF +#if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_BF]) BF_set_key(&bf_ks, 16, key16); #endif @@ -2650,7 +2650,7 @@ int speed_main(int argc, char **argv) } } #endif -#ifndef OPENSSL_NO_BF +#if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_CBC_BF]) { if (async_jobs > 0) { BIO_printf(bio_err, "Async mode is not supported with %s\n", @@ -3502,7 +3502,7 @@ int speed_main(int argc, char **argv) #ifndef OPENSSL_NO_IDEA printf("%s ", IDEA_options()); #endif -#ifndef OPENSSL_NO_BF +#if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0) printf("%s ", BF_options()); #endif printf("\n%s\n", OpenSSL_version(OPENSSL_CFLAGS)); diff --git a/apps/version.c b/apps/version.c index 2b06f9221b..694013e110 100644 --- a/apps/version.c +++ b/apps/version.c @@ -141,9 +141,6 @@ opthelp: #ifndef OPENSSL_NO_IDEA printf(" %s", IDEA_options()); #endif -#ifndef OPENSSL_NO_BF - printf(" %s", BF_options()); -#endif printf("\n"); } if (cflags) |