Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keep RNG seed file descriptor open until the RNG is freed. #7586

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Keep RNG seed file descriptor open until the RNG is freed. #7586

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8419c8f
Keep RNG seed file descriptor open until the RNG is freed.
kareem-wolfssl May 24, 2024
e3bb0bc
Initalize RNG seed fd in _InitRng.
kareem-wolfssl May 24, 2024
1328b26
Reset fd after closing it.
kareem-wolfssl May 28, 2024
87e70a7
Only attempt to close RNG file descriptor on platforms with XCLOSE.
kareem-wolfssl Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions wolfcrypt/src/random.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,6 +1659,10 @@ static int _InitRng(WC_RNG* rng, byte* nonce, word32 nonceSz,
}
#endif

#ifndef USE_WINDOWS_API
rng->seed.fd = 0;
#endif

#ifdef CUSTOM_RAND_GENERATE_BLOCK
ret = 0; /* success */
#else
Expand Down Expand Up @@ -2033,6 +2037,13 @@ int wc_FreeRng(WC_RNG* rng)
ret = WC_HW_E;
#endif

#ifdef XCLOSE
if(rng->seed.fd != 0 && rng->seed.fd != -1) {
XCLOSE(rng->seed.fd);
rng->seed.fd = -1;
}
#endif

return ret;
}

Expand Down Expand Up @@ -4036,20 +4047,22 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
#endif /* HAVE_INTEL_RDSEED || HAVE_AMD_RDSEED */

#ifndef NO_DEV_URANDOM /* way to disable use of /dev/urandom */
os->fd = open("/dev/urandom", O_RDONLY);
if (os->fd == 0 || os->fd == -1) {
os->fd = open("/dev/urandom", O_RDONLY);
#if defined(DEBUG_WOLFSSL)
WOLFSSL_MSG("opened /dev/urandom.");
#endif
if (os->fd == -1)
#endif
{
/* may still have /dev/random */
os->fd = open("/dev/random", O_RDONLY);
#if defined(DEBUG_WOLFSSL)
WOLFSSL_MSG("opened /dev/urandom.");
WOLFSSL_MSG("opened /dev/random.");
#endif
if (os->fd == -1)
#endif
{
/* may still have /dev/random */
os->fd = open("/dev/random", O_RDONLY);
#if defined(DEBUG_WOLFSSL)
WOLFSSL_MSG("opened /dev/random.");
#endif
if (os->fd == -1)
return OPEN_RAN_E;
if (os->fd == -1)
return OPEN_RAN_E;
}
}
#if defined(DEBUG_WOLFSSL)
WOLFSSL_MSG("rnd read...");
Expand All @@ -4073,7 +4086,6 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
#endif
}
}
close(os->fd);

return ret;
}
Expand Down
Loading