openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

cleanse stack variable in blake2[b|s] finalization 

If the output of a blake2[b|s] digest isn't a multipl of 8, then a stack
buffer is used to compute the final output, which is left un-zeroed
prior to return, allowing the potential leak of key data.  Ensure that,
if the stack variable is used, it gets cleared prior to return.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23173)
This commit is contained in:
Neil Horman 2024-01-01 09:25:03 -05:00
parent 6fd3794814
commit 8b9cf1bc2c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
providers/implementations/digests/blake2b_prov.c
View File

@ -324,8 +324,10 @@ int ossl_blake2b_final(unsigned char *md, BLAKE2B_CTX *c)
for (i = 0; i < iter; ++i)
store64(target + sizeof(c->h[i]) * i, c->h[i]);
if (target != md)
if (target != md) {
memcpy(md, target, c->outlen);
OPENSSL_cleanse(target, sizeof(outbuffer));
}
OPENSSL_cleanse(c, sizeof(BLAKE2B_CTX));
return 1;

4
providers/implementations/digests/blake2s_prov.c
View File

@ -314,8 +314,10 @@ int ossl_blake2s_final(unsigned char *md, BLAKE2S_CTX *c)
for (i = 0; i < iter; ++i)
store32(target + sizeof(c->h[i]) * i, c->h[i]);
if (target != md)
if (target != md) {
memcpy(md, target, c->outlen);
OPENSSL_cleanse(target, sizeof(outbuffer));
}
OPENSSL_cleanse(c, sizeof(BLAKE2S_CTX));
return 1;