WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

add a way to restore previous pid behavior

pull/8867/head
JacobBarthelmeh 2025-06-10 16:12:09 -06:00
parent 4207affc72
commit 47cf634965
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/os-check.yml vendored
View File

@ -49,6 +49,8 @@ jobs:
'--enable-dtls --enable-dtls13 --enable-dtls-frag-ch '--enable-dtls --enable-dtls13 --enable-dtls-frag-ch
--enable-dtls-mtu CPPFLAGS=-DWOLFSSL_DTLS_RECORDS_CAN_SPAN_DATAGRAMS', --enable-dtls-mtu CPPFLAGS=-DWOLFSSL_DTLS_RECORDS_CAN_SPAN_DATAGRAMS',
'--enable-opensslall --enable-opensslextra CPPFLAGS=-DWC_RNG_SEED_CB', '--enable-opensslall --enable-opensslextra CPPFLAGS=-DWC_RNG_SEED_CB',
'--enable-opensslall --enable-opensslextra
CPPFLAGS='-DWC_RNG_SEED_CB -DWOLFSSL_NO_GETPID'',
] ]
name: make check name: make check
if: github.repository_owner == 'wolfssl' if: github.repository_owner == 'wolfssl'

11
src/ssl.c
View File

@ -25500,7 +25500,8 @@ static int wolfSSL_RAND_InitMutex(void)
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
#if defined(HAVE_GETPID) && defined(HAVE_FIPS) && FIPS_VERSION3_LT(6,0,0) #if defined(HAVE_GETPID) && !defined(WOLFSSL_NO_GETPID) && \
defined(HAVE_FIPS) && FIPS_VERSION3_LT(6,0,0)
/* In older FIPS bundles add check for reseed here since it does not exist in /* In older FIPS bundles add check for reseed here since it does not exist in
* the older random.c certified files. */ * the older random.c certified files. */
static pid_t currentRandPid = 0; static pid_t currentRandPid = 0;
@ -25518,8 +25519,8 @@ int wolfSSL_RAND_Init(void)
if (initGlobalRNG == 0) { if (initGlobalRNG == 0) {
ret = wc_InitRng(&globalRNG); ret = wc_InitRng(&globalRNG);
if (ret == 0) { if (ret == 0) {
#if defined(HAVE_GETPID) && defined(HAVE_FIPS) && \ #if defined(HAVE_GETPID) && !defined(WOLFSSL_NO_GETPID) && \
FIPS_VERSION3_LT(6,0,0) defined(HAVE_FIPS) && FIPS_VERSION3_LT(6,0,0)
currentRandPid = getpid(); currentRandPid = getpid();
#endif #endif
initGlobalRNG = 1; initGlobalRNG = 1;
@ -25999,8 +26000,8 @@ int wolfSSL_RAND_bytes(unsigned char* buf, int num)
* have the lock. * have the lock.
*/ */
if (initGlobalRNG) { if (initGlobalRNG) {
#if defined(HAVE_GETPID) && defined(HAVE_FIPS) && \ #if defined(HAVE_GETPID) && !defined(WOLFSSL_NO_GETPID) && \
FIPS_VERSION3_LT(6,0,0) defined(HAVE_FIPS) && FIPS_VERSION3_LT(6,0,0)
pid_t p; pid_t p;
p = getpid(); p = getpid();

4
tests/api.c
View File

@ -33159,7 +33159,11 @@ static int test_wolfSSL_RAND_bytes(void)
ExpectIntEQ(RAND_bytes(randbuf, sizeof(randbuf)), 1); ExpectIntEQ(RAND_bytes(randbuf, sizeof(randbuf)), 1);
ExpectIntEQ(read(pipefds[0], &childrand64, sizeof(childrand64)), ExpectIntEQ(read(pipefds[0], &childrand64, sizeof(childrand64)),
sizeof(childrand64)); sizeof(childrand64));
#ifdef WOLFSSL_NO_GETPID
ExpectBufEQ(randbuf, &childrand64, sizeof(randbuf));
#else
ExpectBufNE(randbuf, &childrand64, sizeof(randbuf)); ExpectBufNE(randbuf, &childrand64, sizeof(randbuf));
#endif
close(pipefds[0]); close(pipefds[0]);
waitpid(pid, &waitstatus, 0); waitpid(pid, &waitstatus, 0);
} }

4
wolfcrypt/src/random.c
View File

@ -1640,7 +1640,7 @@ static int _InitRng(WC_RNG* rng, byte* nonce, word32 nonceSz,
#else #else
rng->heap = heap; rng->heap = heap;
#endif #endif
#ifdef HAVE_GETPID #if defined(HAVE_GETPID) && !defined(WOLFSSL_NO_GETPID)
rng->pid = getpid(); rng->pid = getpid();
#endif #endif
#if defined(WOLFSSL_ASYNC_CRYPT) || defined(WOLF_CRYPTO_CB) #if defined(WOLFSSL_ASYNC_CRYPT) || defined(WOLF_CRYPTO_CB)
@ -2014,7 +2014,7 @@ int wc_RNG_GenerateBlock(WC_RNG* rng, byte* output, word32 sz)
if (rng->status != DRBG_OK) if (rng->status != DRBG_OK)
return RNG_FAILURE_E; return RNG_FAILURE_E;
#ifdef HAVE_GETPID #if defined(HAVE_GETPID) && !defined(WOLFSSL_NO_GETPID)
if (rng->pid != getpid()) { if (rng->pid != getpid()) {
rng->pid = getpid(); rng->pid = getpid();
ret = PollAndReSeed(rng); ret = PollAndReSeed(rng);

2
wolfssl/wolfcrypt/random.h
View File

@ -189,7 +189,7 @@ struct WC_RNG {
#endif #endif
byte status; byte status;
#endif #endif
#ifdef HAVE_GETPID #if defined(HAVE_GETPID) && !defined(WOLFSSL_NO_GETPID)
pid_t pid; pid_t pid;
#endif #endif
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT