diff options
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/ecdh')
| -rw-r--r--[-rwxr-xr-x] | Cryptlib/OpenSSL/crypto/ecdh/ech_err.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | Cryptlib/OpenSSL/crypto/ecdh/ech_key.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c | 11 | ||||
| -rw-r--r--[-rwxr-xr-x] | Cryptlib/OpenSSL/crypto/ecdh/ech_ossl.c | 0 |
4 files changed, 9 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/crypto/ecdh/ech_err.c b/Cryptlib/OpenSSL/crypto/ecdh/ech_err.c index 4d2ede75..4d2ede75 100755..100644 --- a/Cryptlib/OpenSSL/crypto/ecdh/ech_err.c +++ b/Cryptlib/OpenSSL/crypto/ecdh/ech_err.c diff --git a/Cryptlib/OpenSSL/crypto/ecdh/ech_key.c b/Cryptlib/OpenSSL/crypto/ecdh/ech_key.c index f44da929..f44da929 100755..100644 --- a/Cryptlib/OpenSSL/crypto/ecdh/ech_key.c +++ b/Cryptlib/OpenSSL/crypto/ecdh/ech_key.c diff --git a/Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c b/Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c index bf222347..f9ba5fb5 100755..100644 --- 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; diff --git a/Cryptlib/OpenSSL/crypto/ecdh/ech_ossl.c b/Cryptlib/OpenSSL/crypto/ecdh/ech_ossl.c index 2a40ff12..2a40ff12 100755..100644 --- a/Cryptlib/OpenSSL/crypto/ecdh/ech_ossl.c +++ b/Cryptlib/OpenSSL/crypto/ecdh/ech_ossl.c |