wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-10 23:40:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Track if RNG seed FD was opened and only close it if it was already open. This fixes the case where wc_FreeRng is called when _InitRng was not called on the RNG. Since the FD value defaults to 0 before _InitRng was called, and 0 is potentially a valid FD, it was being closed.

Browse Source
This commit is contained in:
Kareem
2025-12-18 15:27:00 -07:00
parent 0420c942a0
commit 755097d512
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/random.c
+11 -3
View File
@@ -895,7 +895,8 @@ static int _InitRng(WC_RNG* rng, byte* nonce, word32 nonceSz,
#endif
#ifndef USE_WINDOWS_API
rng->seed.fd = -1;
if (!rng->seed.fdOpen)
rng->seed.fd = -1;
#endif
#ifdef CUSTOM_RAND_GENERATE_BLOCK
@@ -1378,9 +1379,10 @@ int wc_FreeRng(WC_RNG* rng)
#endif
#ifdef XCLOSE
if(rng->seed.fd != -1) {
if(rng->seed.fdOpen && rng->seed.fd != -1) {
XCLOSE(rng->seed.fd);
rng->seed.fd = -1;
rng->seed.fdOpen = 0;
}
#endif
@@ -3564,7 +3566,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
#ifndef NO_FILESYSTEM
#ifndef NO_DEV_URANDOM /* way to disable use of /dev/urandom */
if (os->fd == -1) {
if (!os->fdOpen && os->fd == -1) {
os->fd = open("/dev/urandom", O_RDONLY);
#if defined(DEBUG_WOLFSSL)
WOLFSSL_MSG("opened /dev/urandom.");
@@ -3579,6 +3581,12 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
#endif
if (os->fd == -1)
return OPEN_RAN_E;
else
os->fdOpen = 1;
}
else
{
os->fdOpen = 1;
}
}
#if defined(DEBUG_WOLFSSL)
wolfssl/wolfcrypt/random.h
+1
View File
@@ -156,6 +156,7 @@ struct OS_Seed {
ProviderHandle handle;
#else
int fd;
byte fdOpen:1;
#endif
#if defined(WOLF_CRYPTO_CB)
int devId;