zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jitter_generate(): Properly mix in the additional input

Browse Source 
By adding the additional input directly to the pool
we were using just the additional input.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26112)
This commit is contained in:
Tomas Mraz 2024-12-04 11:00:11 +01:00
parent c8bee68185
commit 6bba373ec3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
providers/implementations/rands/seed_src_jitter.c
View File

@ -194,20 +194,20 @@ static int jitter_generate(void *vseed, unsigned char *out, size_t outlen,
return 0; return 0;
} }
if (adin != NULL && adin_len > 0) {
if (!ossl_rand_pool_add(pool, adin, adin_len, 0)) {
ERR_raise(ERR_LIB_PROV, ERR_R_RAND_LIB);
ossl_rand_pool_free(pool);
return 0;
}
}
/* Get entropy from jitter entropy library. */ /* Get entropy from jitter entropy library. */
entropy_available = ossl_prov_acquire_entropy_from_jitter(s, pool); entropy_available = ossl_prov_acquire_entropy_from_jitter(s, pool);
if (entropy_available > 0) if (entropy_available > 0)
memcpy(out, ossl_rand_pool_buffer(pool), ossl_rand_pool_length(pool)); memcpy(out, ossl_rand_pool_buffer(pool), ossl_rand_pool_length(pool));
if (adin != NULL && adin_len > 0) {
size_t i;
/* xor the additional data into the output */
for (i = 0; i < adin_len; ++i)
out[i % outlen] ^= adin[i];
}
ossl_rand_pool_free(pool); ossl_rand_pool_free(pool);
return entropy_available > 0; return entropy_available > 0;
} }