wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR: 2813

Browse source 
Reported by: Constantine Sapuntzakis <csapuntz@gmail.com>

Fix possible deadlock when decoding public keys.
This commit is contained in:
Dr. Stephen Henson 2012-05-11 13:53:23 +00:00
parent 5e145e54cc
commit 482f238069
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -54,6 +54,9 @@
Changes between 1.0.1c and 1.0.1d [xx XXX xxxx] 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 *) Don't use TLS 1.0 record version number in initial client hello
if renegotiating. if renegotiating.
[Steve Henson] [Steve Henson]

5
crypto/asn1/x_pubkey.c
View file

@ -175,12 +175,15 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
CRYPTO_w_lock(CRYPTO_LOCK_EVP_PKEY); CRYPTO_w_lock(CRYPTO_LOCK_EVP_PKEY);
if (key->pkey) if (key->pkey)
{ {
CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY);
EVP_PKEY_free(ret); EVP_PKEY_free(ret);
ret = key->pkey; ret = key->pkey;
} }
else else
{
key->pkey = ret; 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); CRYPTO_add(&ret->references, 1, CRYPTO_LOCK_EVP_PKEY);
return ret; return ret;