generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix EC_KEY initialization race.

Browse Source 
Submitted by: Adam Langley
This commit is contained in:
Bodo Möller
2012-10-05 20:50:11 +00:00
parent 323fa64559
commit f11d0c7908
4 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/ecdh/ech_lib.c
View File

@@ -210,8 +210,15 @@ ECDH_DATA *ecdh_check(EC_KEY *key)
ecdh_data = (ECDH_DATA *)ecdh_data_new();
if (ecdh_data == NULL)
return NULL;
EC_KEY_insert_key_method_data(key, (void *)ecdh_data,
ecdh_data_dup, ecdh_data_free, ecdh_data_free);
data = EC_KEY_insert_key_method_data(key, (void *)ecdh_data,
ecdh_data_dup, ecdh_data_free, ecdh_data_free);
if (data != NULL)
{
/* Another thread raced us to install the key_method
* data and won. */
ecdh_data_free(ecdh_data);
ecdh_data = (ECDH_DATA *)data;
}
}
else
ecdh_data = (ECDH_DATA *)data;