diff options
| author | Pauli <pauli@openssl.org> | 2023-06-22 09:28:11 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-07-01 21:18:25 +1000 |
| commit | 9015cbb6eb7a50b04352d625e3907dfbb70684d0 (patch) | |
| tree | c1a1c780567a3cf618fb3e37bea1b47520919cc9 /crypto | |
| parent | a22d1966bb230c335602ff79ca3356137d16b3e6 (diff) | |
dh: update to structure based atomics
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21260)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/dh/dh_lib.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c index 575442eceb..f774c04383 100644 --- a/crypto/dh/dh_lib.c +++ b/crypto/dh/dh_lib.c @@ -78,7 +78,6 @@ static DH *dh_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx) if (ret == NULL) return NULL; - ret->references = 1; ret->lock = CRYPTO_THREAD_lock_new(); if (ret->lock == NULL) { ERR_raise(ERR_LIB_DH, ERR_R_CRYPTO_LIB); @@ -86,6 +85,9 @@ static DH *dh_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx) return NULL; } + if (!CRYPTO_NEW_REF(&ret->references, 1)) + goto err; + ret->libctx = libctx; ret->meth = DH_get_default_method(); #if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_ENGINE) @@ -133,7 +135,7 @@ void DH_free(DH *r) if (r == NULL) return; - CRYPTO_DOWN_REF(&r->references, &i, r->lock); + CRYPTO_DOWN_REF(&r->references, &i); REF_PRINT_COUNT("DH", r); if (i > 0) return; @@ -149,6 +151,7 @@ void DH_free(DH *r) #endif CRYPTO_THREAD_lock_free(r->lock); + CRYPTO_FREE_REF(&r->references); ossl_ffc_params_cleanup(&r->params); BN_clear_free(r->pub_key); @@ -160,7 +163,7 @@ int DH_up_ref(DH *r) { int i; - if (CRYPTO_UP_REF(&r->references, &i, r->lock) <= 0) + if (CRYPTO_UP_REF(&r->references, &i) <= 0) return 0; REF_PRINT_COUNT("DH", r); |