Skip to content

Commit

Permalink
rands/drbg_hmac.c: Add checks for the EVP_MD_get_size()
Browse files Browse the repository at this point in the history
Add checks for the EVP_MD_get_size() to avoid integer overflow and then explicitly cast from int to size_t.

Fixes: 8bf3665 ("Added DRBG_HMAC & DRBG_HASH + Added defaults for setting DRBG for master/public/private + renamed generate_counter back to reseed_counter + generated new cavs data tests")
Signed-off-by: Jiasheng Jiang <jiasheng@purdue.edu>

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from #23945)
  • Loading branch information
JiangJias authored and nhorman committed Apr 1, 2024
1 parent e97f468 commit 81f2b04
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion providers/implementations/rands/drbg_hmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@ static int drbg_hmac_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[]
PROV_DRBG_HMAC *hmac = (PROV_DRBG_HMAC *)ctx->data;
OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(ctx->provctx);
const EVP_MD *md;
int md_size;

if (!ossl_prov_digest_load_from_params(&hmac->digest, params, libctx))
return 0;
Expand All @@ -424,7 +425,10 @@ static int drbg_hmac_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[]

if (md != NULL && hmac->ctx != NULL) {
/* These are taken from SP 800-90 10.1 Table 2 */
hmac->blocklen = EVP_MD_get_size(md);
md_size = EVP_MD_get_size(md);
if (md_size <= 0)
return 0;
hmac->blocklen = (size_t)md_size;
/* See SP800-57 Part1 Rev4 5.6.1 Table 3 */
ctx->strength = 64 * (int)(hmac->blocklen >> 3);
if (ctx->strength > 256)
Expand Down

0 comments on commit 81f2b04

Please sign in to comment.