QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-05 14:09:41 +00:00
Code Issues Projects Releases Wiki Activity

DRBG: Fix the renamed functions after the EVP_MAC name reversal

Browse Source 
[extended tests]

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/12186)
This commit is contained in:
Richard Levitte 2020-07-16 06:49:45 +02:00
parent 660c534435
commit e4162f86d7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
providers/implementations/rands/drbg_hmac.c
View File

@ -64,7 +64,7 @@ static int do_hmac(PROV_DRBG_HMAC *hmac, unsigned char inbyte,
*params = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, hmac->K, *params = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, hmac->K,
hmac->blocklen); hmac->blocklen);
if (!EVP_MAC_set_ctx_params(ctx, params) if (!EVP_MAC_CTX_set_params(ctx, params)
|| !EVP_MAC_init(ctx) || !EVP_MAC_init(ctx)
/* K = HMAC(K, V || inbyte || [in1] || [in2] || [in3]) */ /* K = HMAC(K, V || inbyte || [in1] || [in2] || [in3]) */
|| !EVP_MAC_update(ctx, hmac->V, hmac->blocklen) || !EVP_MAC_update(ctx, hmac->V, hmac->blocklen)
@ -78,7 +78,7 @@ static int do_hmac(PROV_DRBG_HMAC *hmac, unsigned char inbyte,
/* V = HMAC(K, V) */ /* V = HMAC(K, V) */
*params = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, hmac->K, *params = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, hmac->K,
hmac->blocklen); hmac->blocklen);
return EVP_MAC_set_ctx_params(ctx, params) return EVP_MAC_CTX_set_params(ctx, params)
&& EVP_MAC_init(ctx) && EVP_MAC_init(ctx)
&& EVP_MAC_update(ctx, hmac->V, hmac->blocklen) && EVP_MAC_update(ctx, hmac->V, hmac->blocklen)
&& EVP_MAC_final(ctx, hmac->V, NULL, sizeof(hmac->V)); && EVP_MAC_final(ctx, hmac->V, NULL, sizeof(hmac->V));
@ -220,7 +220,7 @@ static int drbg_hmac_generate(PROV_DRBG *drbg,
for (;;) { for (;;) {
*params = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, *params = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
hmac->K, hmac->blocklen); hmac->K, hmac->blocklen);
if (!EVP_MAC_set_ctx_params(ctx, params) if (!EVP_MAC_CTX_set_params(ctx, params)
|| !EVP_MAC_init(ctx) || !EVP_MAC_init(ctx)
|| !EVP_MAC_update(ctx, temp, hmac->blocklen)) || !EVP_MAC_update(ctx, temp, hmac->blocklen))
return 0; return 0;
@ -315,7 +315,7 @@ static void drbg_hmac_free(void *vdrbg)
PROV_DRBG_HMAC *hmac; PROV_DRBG_HMAC *hmac;
if (drbg != NULL && (hmac = (PROV_DRBG_HMAC *)drbg->data) != NULL) { if (drbg != NULL && (hmac = (PROV_DRBG_HMAC *)drbg->data) != NULL) {
EVP_MAC_free_ctx(hmac->ctx); EVP_MAC_CTX_free(hmac->ctx);
ossl_prov_digest_reset(&hmac->digest); ossl_prov_digest_reset(&hmac->digest);
OPENSSL_secure_clear_free(hmac, sizeof(*hmac)); OPENSSL_secure_clear_free(hmac, sizeof(*hmac));
} }