diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-05-11 13:53:37 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-05-11 13:53:37 +0000 |
| commit | 4242a090c7fe60a4b84a68bfac836596590c66c5 (patch) | |
| tree | 0fcf99d21d18f458da704a140b00b479d39babd9 /crypto/asn1/x_pubkey.c | |
| parent | c3b130338760a7e52656fd217d1d4c846e85cdff (diff) | |
| download | openssl-4242a090c7fe60a4b84a68bfac836596590c66c5.zip openssl-4242a090c7fe60a4b84a68bfac836596590c66c5.tar.gz openssl-4242a090c7fe60a4b84a68bfac836596590c66c5.tar.bz2 | |
PR: 2813
Reported by: Constantine Sapuntzakis <csapuntz@gmail.com>
Fix possible deadlock when decoding public keys.
Diffstat (limited to 'crypto/asn1/x_pubkey.c')
| -rw-r--r-- | crypto/asn1/x_pubkey.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 627ec87..b649e1f 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -175,12 +175,15 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) CRYPTO_w_lock(CRYPTO_LOCK_EVP_PKEY); if (key->pkey) { + CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY); EVP_PKEY_free(ret); ret = key->pkey; } else + { key->pkey = ret; - CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY); + CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY); + } CRYPTO_add(&ret->references, 1, CRYPTO_LOCK_EVP_PKEY); return ret; |