mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3669 from embhorn/gh3657

Browse Source 
Protect use of globalRNG
This commit is contained in:
David Garske 2021-01-21 14:09:59 -08:00 committed by GitHub
commit fbe5fe1945
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@ -30943,6 +30943,7 @@ int wolfSSL_RAND_bytes(unsigned char* buf, int num)
#else
WC_RNG tmpRNG[1];
#endif
int used_global = 0;
WOLFSSL_ENTER("wolfSSL_RAND_bytes");
@ -30952,8 +30953,15 @@ int wolfSSL_RAND_bytes(unsigned char* buf, int num)
return ret;
#endif
if (initGlobalRNG)
if (initGlobalRNG) {
if (wc_LockMutex(&globalRNGMutex) != 0) {
WOLFSSL_MSG("Bad Lock Mutex rng");
return ret;
}
rng = &globalRNG;
used_global = 1;
}
else if(wc_InitRng(tmpRNG) == 0) {
rng = tmpRNG;
initTmpRng = 1;
@ -30965,6 +30973,10 @@ int wolfSSL_RAND_bytes(unsigned char* buf, int num)
ret = WOLFSSL_SUCCESS;
}
if (used_global == 1) {
wc_UnLockMutex(&globalRNGMutex);
}
if (initTmpRng)
wc_FreeRng(tmpRNG);