diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2016-03-01 18:06:15 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-08 11:10:34 -0500 |
| commit | c001ce33137993a0c4ff15060ed1639826bfca0b (patch) | |
| tree | 0589954d36d7138b51b4e9906a2d728e9c25669c /crypto/asn1/x_info.c | |
| parent | 41cfbccc99f3ca3c9f656d8c71e2db5bcfcf6817 (diff) | |
Convert CRYPTO_LOCK_X509_* to new multi-threading API
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/asn1/x_info.c')
| -rw-r--r-- | crypto/asn1/x_info.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/crypto/asn1/x_info.c b/crypto/asn1/x_info.c index adee224699..4b3b7de870 100644 --- a/crypto/asn1/x_info.c +++ b/crypto/asn1/x_info.c @@ -68,10 +68,18 @@ X509_INFO *X509_INFO_new(void) ret = OPENSSL_zalloc(sizeof(*ret)); if (ret == NULL) { ASN1err(ASN1_F_X509_INFO_NEW, ERR_R_MALLOC_FAILURE); - return (NULL); + return NULL; } + ret->references = 1; - return (ret); + + ret->lock = CRYPTO_THREAD_lock_new(); + if (ret->lock == NULL) { + X509_INFO_free(ret); + return NULL; + } + + return ret; } void X509_INFO_free(X509_INFO *x) @@ -81,7 +89,7 @@ void X509_INFO_free(X509_INFO *x) if (x == NULL) return; - i = CRYPTO_add(&x->references, -1, CRYPTO_LOCK_X509_INFO); + CRYPTO_atomic_add(&x->references, -1, &i, x->lock); REF_PRINT_COUNT("X509_INFO", x); if (i > 0) return; @@ -91,5 +99,6 @@ void X509_INFO_free(X509_INFO *x) X509_CRL_free(x->crl); X509_PKEY_free(x->x_pkey); OPENSSL_free(x->enc_data); + CRYPTO_THREAD_lock_free(x->lock); OPENSSL_free(x); } |