Skip to content

Commit f2abadb

Browse files
authored
Merge pull request #8950 from douzzer/20250701-Hash_DRBG_Generate-DEBUG_WOLFSSL
20250701-Hash_DRBG_Generate-DEBUG_WOLFSSL
2 parents 8fa0f6b + a8fc68d commit f2abadb

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

.wolfssl_known_macro_extras

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ MAXQ10XX_PRODUCTION_KEY
305305
MAXQ_EXPORT_TLS_KEYS
306306
MAXQ_SHA1
307307
MAXSEG_64K
308-
MAX_WOLFSSL_FILE_SIZE
309308
MAX_OID_SZ
309+
MAX_WOLFSSL_FILE_SIZE
310310
MDK_CONF_BARE_METAL
311311
MDK_CONF_FS
312312
MDK_CONF_RTX_TCP_FS
@@ -612,7 +612,6 @@ WOLFSSL_ALGO_HW_MUTEX
612612
WOLFSSL_ALLOW_CRIT_AIA
613613
WOLFSSL_ALLOW_CRIT_AKID
614614
WOLFSSL_ALLOW_CRIT_SKID
615-
WOLFSSL_ALLOW_ENCODING_CA_FALSE
616615
WOLFSSL_ALLOW_MAX_FRAGMENT_ADJUST
617616
WOLFSSL_ALLOW_NO_CN_IN_SAN
618617
WOLFSSL_ALLOW_NO_SUITES
@@ -872,7 +871,6 @@ WOLFSSL_USE_OPTIONS_H
872871
WOLFSSL_USE_POPEN_HOST
873872
WOLFSSL_VALIDATE_DH_KEYGEN
874873
WOLFSSL_WC_LMS_SERIALIZE_STATE
875-
WOLFSSL_WC_MLKEM
876874
WOLFSSL_WC_XMSS_NO_SHA256
877875
WOLFSSL_WC_XMSS_NO_SHAKE256
878876
WOLFSSL_WICED_PSEUDO_UNIX_EPOCH_TIME

wolfcrypt/src/random.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ This library contains implementation for the random number generator.
232232

233233
#define OUTPUT_BLOCK_LEN (WC_SHA256_DIGEST_SIZE)
234234
#define MAX_REQUEST_LEN (0x10000)
235-
#define RESEED_INTERVAL WC_RESEED_INTERVAL
236235

237236

238237
/* The security strength for the RNG is the target number of bits of
@@ -645,10 +644,11 @@ static int Hash_DRBG_Generate(DRBG_internal* drbg, byte* out, word32 outSz)
645644
return DRBG_FAILURE;
646645
}
647646

648-
if (drbg->reseedCtr == RESEED_INTERVAL) {
649-
#if FIPS_VERSION3_GE(6,0,0)
650-
printf("Reseed triggered\n");
651-
#endif
647+
if (drbg->reseedCtr >= WC_RESEED_INTERVAL) {
648+
#if defined(DEBUG_WOLFSSL) || defined(DEBUG_DRBG_RESEEDS)
649+
printf("DRBG reseed triggered, reseedCtr == %lu",
650+
(unsigned long)drbg->reseedCtr);
651+
#endif
652652
return DRBG_NEED_RESEED;
653653
}
654654
else {

0 commit comments

Comments
 (0)