root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

evp_md_init_internal: Avoid reallocating algctx if digest unchanged 

Fixes #16947

Also refactor out algctx freeing into a separate function.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18105)
This commit is contained in:
Tomas Mraz 2022-04-13 16:26:18 +02:00
parent e3477d3e5c
commit fe5c5cb851
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
crypto/evp/digest.c
View File

@ -141,6 +141,20 @@ void EVP_MD_CTX_free(EVP_MD_CTX *ctx)
OPENSSL_free(ctx); OPENSSL_free(ctx);
} }
int evp_md_ctx_free_algctx(EVP_MD_CTX *ctx)
{
if (ctx->algctx != NULL) {
if (!ossl_assert(ctx->digest != NULL)) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
}
if (ctx->digest->freectx != NULL)
ctx->digest->freectx(ctx->algctx);
ctx->algctx = NULL;
}
return 1;
}
static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type, static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
const OSSL_PARAM params[], ENGINE *impl) const OSSL_PARAM params[], ENGINE *impl)
{ {
@ -169,16 +183,6 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
EVP_MD_CTX_clear_flags(ctx, EVP_MD_CTX_FLAG_CLEANED); EVP_MD_CTX_clear_flags(ctx, EVP_MD_CTX_FLAG_CLEANED);
if (ctx->algctx != NULL) {
if (!ossl_assert(ctx->digest != NULL)) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
}
if (ctx->digest->freectx != NULL)
ctx->digest->freectx(ctx->algctx);
ctx->algctx = NULL;
}
if (type != NULL) { if (type != NULL) {
ctx->reqdigest = type; ctx->reqdigest = type;
} else { } else {
@ -227,6 +231,10 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
#endif #endif
|| (ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0 || (ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0
|| type->origin == EVP_ORIG_METH) { || type->origin == EVP_ORIG_METH) {
/* If we were using provided hash before, cleanup algctx */
if (!evp_md_ctx_free_algctx(ctx))
return 0;
if (ctx->digest == ctx->fetched_digest) if (ctx->digest == ctx->fetched_digest)
ctx->digest = NULL; ctx->digest = NULL;
EVP_MD_free(ctx->fetched_digest); EVP_MD_free(ctx->fetched_digest);
@ -237,6 +245,8 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
cleanup_old_md_data(ctx, 1); cleanup_old_md_data(ctx, 1);
/* Start of non-legacy code below */ /* Start of non-legacy code below */
if (ctx->digest != type && !evp_md_ctx_free_algctx(ctx))
return 0;
if (type->prov == NULL) { if (type->prov == NULL) {
#ifdef FIPS_MODULE #ifdef FIPS_MODULE
@ -259,11 +269,6 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
#endif #endif
} }
if (ctx->algctx != NULL && ctx->digest != NULL && ctx->digest != type) {
if (ctx->digest->freectx != NULL)
ctx->digest->freectx(ctx->algctx);
ctx->algctx = NULL;
}
if (type->prov != NULL && ctx->fetched_digest != type) { if (type->prov != NULL && ctx->fetched_digest != type) {
if (!EVP_MD_up_ref((EVP_MD *)type)) { if (!EVP_MD_up_ref((EVP_MD *)type)) {
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR); ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);

11
crypto/evp/m_sigver.c
View File

@ -51,15 +51,8 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
void *provkey = NULL; void *provkey = NULL;
int ret, iter, reinit = 1; int ret, iter, reinit = 1;
if (ctx->algctx != NULL) { if (!evp_md_ctx_free_algctx(ctx))
if (!ossl_assert(ctx->digest != NULL)) { return 0;
ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
return 0;
}
if (ctx->digest->freectx != NULL)
ctx->digest->freectx(ctx->algctx);
ctx->algctx = NULL;
}
if (ctx->pctx == NULL) { if (ctx->pctx == NULL) {
reinit = 0; reinit = 0;

2
include/crypto/evp.h
View File

@ -901,6 +901,8 @@ int evp_set_default_properties_int(OSSL_LIB_CTX *libctx, const char *propq,
char *evp_get_global_properties_str(OSSL_LIB_CTX *libctx, int loadconfig); char *evp_get_global_properties_str(OSSL_LIB_CTX *libctx, int loadconfig);
void evp_md_ctx_clear_digest(EVP_MD_CTX *ctx, int force, int keep_digest); void evp_md_ctx_clear_digest(EVP_MD_CTX *ctx, int force, int keep_digest);
/* just free the algctx if set, returns 0 on inconsistent state of ctx */
int evp_md_ctx_free_algctx(EVP_MD_CTX *ctx);
/* Three possible states: */ /* Three possible states: */
# define EVP_PKEY_STATE_UNKNOWN 0 # define EVP_PKEY_STATE_UNKNOWN 0