diff options
| author | Fedor Indutny <fedor.indutny@gmail.com> | 2013-02-20 15:54:22 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor.indutny@gmail.com> | 2013-02-20 16:48:20 +0400 |
| commit | f317f5aee91a2c21d68a9b94b0742d6b45bc44e8 (patch) | |
| tree | 79d785ef15fc109c148d4c59d2c1188424468e33 /deps/openssl/openssl/crypto/ecdsa/ecs_lib.c | |
| parent | f1780a6be63d85023053bc0cbec04106e4e8fe04 (diff) | |
| download | android-node-v8-f317f5aee91a2c21d68a9b94b0742d6b45bc44e8.tar.gz android-node-v8-f317f5aee91a2c21d68a9b94b0742d6b45bc44e8.tar.bz2 android-node-v8-f317f5aee91a2c21d68a9b94b0742d6b45bc44e8.zip | |
openssl: update to 1.0.1e
Diffstat (limited to 'deps/openssl/openssl/crypto/ecdsa/ecs_lib.c')
| -rw-r--r-- | deps/openssl/openssl/crypto/ecdsa/ecs_lib.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/deps/openssl/openssl/crypto/ecdsa/ecs_lib.c b/deps/openssl/openssl/crypto/ecdsa/ecs_lib.c index e477da430b..814a6bf404 100644 --- a/deps/openssl/openssl/crypto/ecdsa/ecs_lib.c +++ b/deps/openssl/openssl/crypto/ecdsa/ecs_lib.c @@ -200,8 +200,15 @@ ECDSA_DATA *ecdsa_check(EC_KEY *key) ecdsa_data = (ECDSA_DATA *)ecdsa_data_new(); if (ecdsa_data == NULL) return NULL; - EC_KEY_insert_key_method_data(key, (void *)ecdsa_data, - ecdsa_data_dup, ecdsa_data_free, ecdsa_data_free); + data = EC_KEY_insert_key_method_data(key, (void *)ecdsa_data, + ecdsa_data_dup, ecdsa_data_free, ecdsa_data_free); + if (data != NULL) + { + /* Another thread raced us to install the key_method + * data and won. */ + ecdsa_data_free(ecdsa_data); + ecdsa_data = (ECDSA_DATA *)data; + } } else ecdsa_data = (ECDSA_DATA *)data; |