diff options
| author | Pauli <paul.dale@oracle.com> | 2020-01-08 15:13:11 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-01-12 12:05:04 +1000 |
| commit | 7c3aa39fe38a70450b5bf3665ca48be80c5ff287 (patch) | |
| tree | 5ee022ba2334c7078908237ed36259e2fd49bf95 /apps | |
| parent | c52ec197aae43e624702a79cdbb73a1d2c7c9d09 (diff) | |
Deprecate the low level Whirlpool functions.
Use of the low level Whirlpool functions has been informally discouraged for a
long time. We now formally deprecate them.
Applications should instead use the EVP APIs, e.g. EVP_Digest,
EVP_DigestInit_ex, EVP_DigestUpdate and EVP_DigestFinal_ex.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10779)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/speed.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/speed.c b/apps/speed.c index 8d3b91aaa1..5b87293123 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -345,7 +345,7 @@ static const OPT_PAIR doit_choices[] = { {"sha1", D_SHA1}, {"sha256", D_SHA256}, {"sha512", D_SHA512}, -#ifndef OPENSSL_NO_WHIRLPOOL +#if !defined(OPENSSL_NO_WHIRLPOOL) && !defined(OPENSSL_NO_DEPRECATED_3_0) {"whirlpool", D_WHIRLPOOL}, #endif #if !defined(OPENSSL_NO_RMD160) && !defined(OPENSSL_NO_DEPRECATED_3_0) @@ -683,7 +683,7 @@ static int SHA512_loop(void *args) return count; } -#ifndef OPENSSL_NO_WHIRLPOOL +#if !defined(OPENSSL_NO_WHIRLPOOL) && !defined(OPENSSL_NO_DEPRECATED_3_0) static int WHIRLPOOL_loop(void *args) { loopargs_t *tempargs = *(loopargs_t **) args; @@ -2350,7 +2350,7 @@ int speed_main(int argc, char **argv) print_result(D_SHA512, testnum, count, d); } } -#ifndef OPENSSL_NO_WHIRLPOOL +#if !defined(OPENSSL_NO_WHIRLPOOL) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_WHIRLPOOL]) { for (testnum = 0; testnum < size_num; testnum++) { print_message(names[D_WHIRLPOOL], c[D_WHIRLPOOL][testnum], |