diff options
| author | Pauli <paul.dale@oracle.com> | 2020-01-09 04:14:13 +0100 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-01-19 01:14:39 +0100 |
| commit | 85d843c8eccce937d073a9df7a193032478e21dd (patch) | |
| tree | 747b066f6bae0f7440ccb9e7398f632783012440 /engines/e_dasync.c | |
| parent | sha: fix preprocessor indentation (diff) | |
| download | openssl-85d843c8eccce937d073a9df7a193032478e21dd.tar.xz openssl-85d843c8eccce937d073a9df7a193032478e21dd.zip | |
Deprecate the low level SHA functions.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10791)
Diffstat (limited to 'engines/e_dasync.c')
| -rw-r--r-- | engines/e_dasync.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/engines/e_dasync.c b/engines/e_dasync.c index 74a62b86e0..c5d58ded09 100644 --- a/engines/e_dasync.c +++ b/engines/e_dasync.c @@ -7,6 +7,14 @@ * https://www.openssl.org/source/license.html */ +/* + * SHA-1 low level APIs are deprecated for public use, but still ok for + * internal use. Note, that due to symbols not being exported, only the + * #defines and strucures can be accessed, in this case SHA_CBLOCK and + * sizeof(SHA_CTX). + */ +#include "internal/deprecated.h" + #if defined(_WIN32) # include <windows.h> #endif @@ -492,13 +500,11 @@ static void dummy_pause_job(void) { * SHA1 implementation. At the moment we just defer to the standard * implementation */ -#undef data -#define data(ctx) ((SHA_CTX *)EVP_MD_CTX_md_data(ctx)) static int dasync_sha1_init(EVP_MD_CTX *ctx) { dummy_pause_job(); - return SHA1_Init(data(ctx)); + return EVP_MD_meth_get_init(EVP_sha1())(ctx); } static int dasync_sha1_update(EVP_MD_CTX *ctx, const void *data, @@ -506,14 +512,14 @@ static int dasync_sha1_update(EVP_MD_CTX *ctx, const void *data, { dummy_pause_job(); - return SHA1_Update(data(ctx), data, (size_t)count); + return EVP_MD_meth_get_update(EVP_sha1())(ctx, data, count); } static int dasync_sha1_final(EVP_MD_CTX *ctx, unsigned char *md) { dummy_pause_job(); - return SHA1_Final(md, data(ctx)); + return EVP_MD_meth_get_final(EVP_sha1())(ctx, md); } /* |