wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-05 12:20:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add MAX ENTROPY BITS check

Browse Source
This commit is contained in:
Hideki Miyazaki
2026-06-04 09:08:24 +09:00
parent 3bc1575e12
commit 9e711f5c9c
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/api/test_random.c
+30
View File
@@ -30,6 +30,9 @@
#include <wolfssl/wolfcrypt/random.h>
#include <wolfssl/wolfcrypt/types.h>
#ifdef HAVE_ENTROPY_MEMUSE
#include <wolfssl/wolfcrypt/wolfentropy.h>
#endif
#include <tests/api/api.h>
#include <tests/api/test_random.h>
@@ -739,3 +742,30 @@ int test_wc_RNG_HealthTest_SHA512(void)
return EXPECT_RESULT();
}
int test_wc_Entropy_Get(void)
{
EXPECT_DECLS;
#ifdef HAVE_ENTROPY_MEMUSE
byte entropy[WC_SHA3_256_DIGEST_SIZE]; /* 32 bytes */
/* bits <= 0: must reject */
ExpectIntEQ(wc_Entropy_Get(0, entropy, sizeof(entropy)),
WC_NO_ERR_TRACE(BAD_FUNC_ARG));
ExpectIntEQ(wc_Entropy_Get(-1, entropy, sizeof(entropy)),
WC_NO_ERR_TRACE(BAD_FUNC_ARG));
/* bits > MAX_ENTROPY_BITS: must reject (overflow guard) */
ExpectIntEQ(wc_Entropy_Get(MAX_ENTROPY_BITS + 1, entropy, sizeof(entropy)),
WC_NO_ERR_TRACE(BAD_FUNC_ARG));
ExpectIntEQ(wc_Entropy_Get(2049, entropy, sizeof(entropy)),
WC_NO_ERR_TRACE(BAD_FUNC_ARG));
/* entropy == NULL with len > 0: must reject */
ExpectIntEQ(wc_Entropy_Get(MAX_ENTROPY_BITS, NULL, sizeof(entropy)),
WC_NO_ERR_TRACE(BAD_FUNC_ARG));
/* valid call: bits == MAX_ENTROPY_BITS */
ExpectIntEQ(wc_Entropy_Get(MAX_ENTROPY_BITS, entropy, sizeof(entropy)), 0);
#endif /* HAVE_ENTROPY_MEMUSE */
return EXPECT_RESULT();
}
tests/api/test_random.h
+3 -1
View File
@@ -37,6 +37,7 @@ int test_wc_RNG_DRBG_Reseed(void);
int test_wc_RNG_TestSeed(void);
int test_wc_RNG_HealthTest(void);
int test_wc_RNG_HealthTest_SHA512(void);
int test_wc_Entropy_Get(void);
#define TEST_RANDOM_DECLS \
TEST_DECL_GROUP("random", test_wc_InitRng), \
@@ -51,6 +52,7 @@ int test_wc_RNG_HealthTest_SHA512(void);
TEST_DECL_GROUP("random", test_wc_RNG_DRBG_Reseed), \
TEST_DECL_GROUP("random", test_wc_RNG_TestSeed), \
TEST_DECL_GROUP("random", test_wc_RNG_HealthTest), \
TEST_DECL_GROUP("random", test_wc_RNG_HealthTest_SHA512)
TEST_DECL_GROUP("random", test_wc_RNG_HealthTest_SHA512), \
TEST_DECL_GROUP("random", test_wc_Entropy_Get)
#endif /* WOLFCRYPT_TEST_RANDOM_H */
wolfcrypt/src/wolfentropy.c
+1 -1
View File
@@ -816,7 +816,7 @@ int wc_Entropy_Get(int bits, unsigned char* entropy, word32 len)
int noise_len;
static byte noise[MAX_NOISE_CNT];
if (bits <= 0 || (entropy == NULL && len > 0)) {
if (bits <= 0 || bits > MAX_ENTROPY_BITS || (entropy == NULL && len > 0)) {
return BAD_FUNC_ARG;
}