wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 02:37:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6183 from ejohnstown/rng-tweak

Browse Source 
RNG Tweak
This commit is contained in:
JacobBarthelmeh
2023-03-10 15:16:54 -07:00
committed by GitHub
parent f2a955d5eb 907a29ab9e
commit bcd6bce040
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wolfcrypt/src/random.c
View File

@ -489,8 +489,6 @@ static int Hash_DRBG_Reseed(DRBG_internal* drbg, const byte* seed, word32 seedSz
} }
if (ret == DRBG_SUCCESS) { if (ret == DRBG_SUCCESS) {
drbg->reseedCtr = 1; drbg->reseedCtr = 1;
drbg->lastBlock = 0;
drbg->matchCount = 0;
} }
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@ -541,7 +539,6 @@ static int Hash_gen(DRBG_internal* drbg, byte* out, word32 outSz, const byte* V)
#endif #endif
int i; int i;
int len; int len;
word32 checkBlock;
#ifdef WOLFSSL_SMALL_STACK_CACHE #ifdef WOLFSSL_SMALL_STACK_CACHE
wc_Sha256* sha = &drbg->sha256; wc_Sha256* sha = &drbg->sha256;
#else #else
@ -590,23 +587,6 @@ static int Hash_gen(DRBG_internal* drbg, byte* out, word32 outSz, const byte* V)
#endif #endif
if (ret == 0) { if (ret == 0) {
XMEMCPY(&checkBlock, digest, sizeof(word32));
if (drbg->reseedCtr > 1 && checkBlock == drbg->lastBlock) {
if (drbg->matchCount == 1) {
return DRBG_CONT_FAILURE;
}
else {
if (i == (len-1)) {
len++;
}
drbg->matchCount = 1;
}
}
else {
drbg->matchCount = 0;
drbg->lastBlock = checkBlock;
}
if (out != NULL && outSz != 0) { if (out != NULL && outSz != 0) {
if (outSz >= OUTPUT_BLOCK_LEN) { if (outSz >= OUTPUT_BLOCK_LEN) {
XMEMCPY(out, digest, OUTPUT_BLOCK_LEN); XMEMCPY(out, digest, OUTPUT_BLOCK_LEN);
@ -762,8 +742,6 @@ static int Hash_DRBG_Instantiate(DRBG_internal* drbg, const byte* seed, word32 s
sizeof(drbg->V), NULL, 0) == DRBG_SUCCESS) { sizeof(drbg->V), NULL, 0) == DRBG_SUCCESS) {
drbg->reseedCtr = 1; drbg->reseedCtr = 1;
drbg->lastBlock = 0;
drbg->matchCount = 0;
ret = DRBG_SUCCESS; ret = DRBG_SUCCESS;
} }

2
wolfssl/wolfcrypt/random.h
View File

@ -159,14 +159,12 @@ struct OS_Seed {
#ifdef HAVE_HASHDRBG #ifdef HAVE_HASHDRBG
struct DRBG_internal { struct DRBG_internal {
word32 reseedCtr; word32 reseedCtr;
word32 lastBlock;
byte V[DRBG_SEED_LEN]; byte V[DRBG_SEED_LEN];
byte C[DRBG_SEED_LEN]; byte C[DRBG_SEED_LEN];
void* heap; void* heap;
#if defined(WOLFSSL_ASYNC_CRYPT) || defined(WOLF_CRYPTO_CB) #if defined(WOLFSSL_ASYNC_CRYPT) || defined(WOLF_CRYPTO_CB)
int devId; int devId;
#endif #endif
byte matchCount;
#ifdef WOLFSSL_SMALL_STACK_CACHE #ifdef WOLFSSL_SMALL_STACK_CACHE
wc_Sha256 sha256; wc_Sha256 sha256;
#endif #endif