diff options
| author | Gary Ching-Pang Lin <glin@suse.com> | 2014-07-14 09:03:36 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2014-07-14 09:03:36 -0400 |
| commit | f9368474dd80b630adf745314b0336c16a35b0ad (patch) | |
| tree | b82d269a6f732af91e6b599003888d8b10a13bf2 /Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c | |
| parent | 875eb1b9d501d853b2c44f86a32a51b59f85eef9 (diff) | |
| download | efi-boot-shim-f9368474dd80b630adf745314b0336c16a35b0ad.tar.gz efi-boot-shim-f9368474dd80b630adf745314b0336c16a35b0ad.zip | |
Update openssl to 0.9.8za
Also update to Tiano Cryptlib r15638
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c')
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c b/Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c index bf222347..f9ba5fb5 100755 --- a/Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c +++ b/Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c @@ -205,8 +205,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; |