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

siphash: Properly set mac size in sipcopy 

Also fully duplicate the context on dup

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18142)
This commit is contained in:
Tomas Mraz 2022-04-21 17:09:14 +02:00
parent 650b142c2e
commit 905fec4f4d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
providers/implementations/macs/siphash_prov.c
View File

@ -77,11 +77,11 @@ static void *siphash_dup(void *vsrc)
if (!ossl_prov_is_running()) if (!ossl_prov_is_running())
return NULL; return NULL;
sdst = siphash_new(ssrc->provctx); sdst = OPENSSL_malloc(sizeof(*sdst));
if (sdst == NULL) if (sdst == NULL)
return NULL; return NULL;
sdst->siphash = ssrc->siphash; *sdst = *ssrc;
return sdst; return sdst;
} }
@ -112,7 +112,8 @@ static int siphash_init(void *vmacctx, const unsigned char *key, size_t keylen,
if (!ossl_prov_is_running() || !siphash_set_params(ctx, params)) if (!ossl_prov_is_running() || !siphash_set_params(ctx, params))
return 0; return 0;
/* Without a key, there is not much to do here, /*
* Without a key, there is not much to do here,
* The actual initialization happens through controls. * The actual initialization happens through controls.
*/ */
if (key == NULL) { if (key == NULL) {
@ -202,7 +203,8 @@ static int siphash_set_params(void *vmacctx, const OSSL_PARAM *params)
if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_SIZE)) != NULL) { if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_SIZE)) != NULL) {
if (!OSSL_PARAM_get_size_t(p, &size) if (!OSSL_PARAM_get_size_t(p, &size)
|| !SipHash_set_hash_size(&ctx->siphash, size)) || !SipHash_set_hash_size(&ctx->siphash, size)
|| !SipHash_set_hash_size(&ctx->sipcopy, size))
return 0; return 0;
} }
if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_C_ROUNDS)) != NULL if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_C_ROUNDS)) != NULL