moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

openssl: avoid static variable for seed flag 

Avoid the race condition risk by instead storing the "seeded" flag in
the multi handle. Modern OpenSSL versions handle the seeding itself so
doing the seeding once per multi-handle instead of once per process is
less of an issue.

Reported-by: Gerrit Renker
Fixes #7296
Closes #7306
This commit is contained in:
Daniel Stenberg 2021-06-28 16:41:17 +02:00
parent b5a434f7f0
commit 4aed7a1923
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/multihandle.h
View File

@ -153,6 +153,9 @@ struct Curl_multi {
bool recheckstate; /* see Curl_multi_connchanged */
bool in_callback; /* true while executing a callback */
bool ipv6_works;
#ifdef USE_OPENSSL
bool ssl_seeded;
#endif
};
#endif /* HEADER_CURL_MULTIHANDLE_H */

9
lib/vtls/openssl.c
View File

@ -435,17 +435,16 @@ static bool rand_enough(void)
static CURLcode ossl_seed(struct Curl_easy *data)
{
/* we have the "SSL is seeded" boolean static to prevent multiple
time-consuming seedings in vain */
static bool ssl_seeded = FALSE;
char fname[256];
if(ssl_seeded)
/* This might get called before it has been added to a multi handle */
if(data->multi && data->multi->ssl_seeded)
return CURLE_OK;
if(rand_enough()) {
/* OpenSSL 1.1.0+ will return here */
ssl_seeded = TRUE;
if(data->multi)
data->multi->ssl_seeded = TRUE;
return CURLE_OK;
}