diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-05-11 13:52:46 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-05-11 13:52:46 +0000 |
| commit | eeca72f71ef0b679ba4314e6e9e6b74e14ca1f7c (patch) | |
| tree | e14e5887f201c74285d662d7564aa1d4d47eca2a | |
| parent | 6e164e5c3d245c92a3793e292ad00c8e14dd7992 (diff) | |
PR: 2813
Reported by: Constantine Sapuntzakis <csapuntz@gmail.com>
Fix possible deadlock when decoding public keys.
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | crypto/asn1/x_pubkey.c | 5 |
2 files changed, 7 insertions, 1 deletions
@@ -4,6 +4,9 @@ Changes between 1.0.1c and 1.0.1d [xx XXX xxxx] + *) Fix possible deadlock when decoding public keys. + [Steve Henson] + *) Don't use TLS 1.0 record version number in initial client hello if renegotiating. [Steve Henson] diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 627ec87f9f..b649e1fcf9 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; |