From eeca72f71ef0b679ba4314e6e9e6b74e14ca1f7c Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 11 May 2012 13:52:46 +0000 Subject: PR: 2813 Reported by: Constantine Sapuntzakis Fix possible deadlock when decoding public keys. --- CHANGES | 3 +++ crypto/asn1/x_pubkey.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ef8dff4a00..abe3b49347 100644 --- a/CHANGES +++ b/CHANGES @@ -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; -- cgit v1.2.3