feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #6240 from kaleb-himes/wolfEntropy-work

Browse Source 
Fix a typo in PP macro and add a ceiling to guard against implementation bugs
This commit is contained in:
Sean Parkinson
2023-03-30 12:33:01 +10:00
committed by GitHub
parent a8ca958855 59107aeaa8
commit 0210dcd98d
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wolfcrypt/src/random.c
View File

@ -991,8 +991,24 @@ static void Entropy_StopThread(void)
#ifndef ENTROPY_NUM_WORDS_BITS
/* Number of bits to count of 64-bit words in state. */
#define ENTROPY_NUM_WORDS_BITS 14
#elif ENTROPY_NUM_WORDS_BITS < 8
#endif
/* Floor of 8 yields pool of 256x 64-bit word samples
* 9 -> 512x 64-bit word samples
* 10 -> 1,024x 64-bit word samples
* 11 -> 2,048x 64-bit word samples
* 12 -> 4,096x 64-bit word samples
* 13 -> 8,192x 64-bit word samples
* 14 -> 16,384x 64-bit word samples
* 15 -> 32,768x 64-bit word samples
* ... doubling every time up to a maximum of:
* 30 -> 1,073,741,824x 64-bit word samples
* 1 billion+ samples should be more then sufficient for any use-case
*/
#if ENTROPY_NUM_WORDS_BITS < 8
#error "ENTROPY_NUM_WORDS_BITS must be 8 or more"
#elif ENTROPY_NUM_WORDS_BITS > 30
#error "ENTROPY_NUM_WORDS_BITS must be less than 31"
#endif
/* Number of 64-bit words in state. */
#define ENTROPY_NUM_WORDS (1 << ENTROPY_NUM_WORDS_BITS)
@ -1010,7 +1026,7 @@ static void Entropy_StopThread(void)
/* Upper round of log2(ENTROPY_NUM_UPDATES) */
#define ENTROPY_NUM_UPDATES_BITS 5
#elif !defined(ENTROPY_NUM_UPDATES_BITS)
#define ENTROP_NUM_UPDATES_BITS ENTROPY_BLOCK_SZ
#define ENTROPY_NUM_UPDATES_BITS ENTROPY_BLOCK_SZ
#endif
/* Amount to shift offset to get better coverage of a block */
#define ENTROPY_OFFSET_SHIFTING \