diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2014-10-07 05:35:11 +0000 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2014-10-07 05:35:11 +0000 |
| commit | 1e963007c0d9466726a8680e52a95955288d8927 (patch) | |
| tree | 9345749af183fe511dfe6a24fb43b44a5feefcd9 /Cryptlib/OpenSSL/crypto/ec/ec_key.c | |
| parent | e34fca619d8a75f3b67d59d45cdd9db4da2342e6 (diff) | |
| download | efi-boot-shim-1e963007c0d9466726a8680e52a95955288d8927.tar.gz efi-boot-shim-1e963007c0d9466726a8680e52a95955288d8927.zip | |
debian/patches/0001-Update-openssl-to-0.9.8za.patch: cherry-pick
openssl 0.9.8za in via upstream.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/ec/ec_key.c')
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/ec/ec_key.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/crypto/ec/ec_key.c b/Cryptlib/OpenSSL/crypto/ec/ec_key.c index 522802c0..6c933d22 100755 --- a/Cryptlib/OpenSSL/crypto/ec/ec_key.c +++ b/Cryptlib/OpenSSL/crypto/ec/ec_key.c @@ -435,18 +435,27 @@ void EC_KEY_set_conv_form(EC_KEY *key, point_conversion_form_t cform) void *EC_KEY_get_key_method_data(EC_KEY *key, void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)) { - return EC_EX_DATA_get_data(key->method_data, dup_func, free_func, clear_free_func); + void *ret; + + CRYPTO_r_lock(CRYPTO_LOCK_EC); + ret = EC_EX_DATA_get_data(key->method_data, dup_func, free_func, clear_free_func); + CRYPTO_r_unlock(CRYPTO_LOCK_EC); + + return ret; } -void EC_KEY_insert_key_method_data(EC_KEY *key, void *data, +void *EC_KEY_insert_key_method_data(EC_KEY *key, void *data, void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)) { EC_EXTRA_DATA *ex_data; + CRYPTO_w_lock(CRYPTO_LOCK_EC); ex_data = EC_EX_DATA_get_data(key->method_data, dup_func, free_func, clear_free_func); if (ex_data == NULL) EC_EX_DATA_set_data(&key->method_data, data, dup_func, free_func, clear_free_func); CRYPTO_w_unlock(CRYPTO_LOCK_EC); + + return ex_data; } void EC_KEY_set_asn1_flag(EC_KEY *key, int flag) |