diff options
author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-03-07 22:45:58 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-05-16 10:17:33 +0100 |
commit | c5ebfcab713a82a1d46a51c8c2668c419425b387 (patch) | |
tree | ca8da99a90b24c37c37ce417ad02c1f35e1e1735 /crypto | |
parent | 592b6fb489c97be2b039ab671647aa58a472204a (diff) |
Unify <TYPE>_up_ref methods signature and behaviour.
Add a status return value instead of void.
Add some sanity checks on reference counter value.
Update the docs.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/evp/p_lib.c | 10 | ||||
-rw-r--r-- | crypto/x509/x509_lu.c | 9 | ||||
-rw-r--r-- | crypto/x509/x509_set.c | 10 | ||||
-rw-r--r-- | crypto/x509/x509cset.c | 10 |
4 files changed, 28 insertions, 11 deletions
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index a8fa301b31..94b311fa90 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -196,10 +196,16 @@ EVP_PKEY *EVP_PKEY_new(void) return ret; } -void EVP_PKEY_up_ref(EVP_PKEY *pkey) +int EVP_PKEY_up_ref(EVP_PKEY *pkey) { int i; - CRYPTO_atomic_add(&pkey->references, 1, &i, pkey->lock); + + if (CRYPTO_atomic_add(&pkey->references, 1, &i, pkey->lock) <= 0) + return 0; + + REF_PRINT_COUNT("EVP_PKEY", pkey); + REF_ASSERT_ISNT(i < 2); + return ((i > 1) ? 1 : 0); } /* diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index c4ca619d8c..3a8c657b85 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -417,18 +417,17 @@ int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x) return ret; } -void X509_OBJECT_up_ref_count(X509_OBJECT *a) +int X509_OBJECT_up_ref_count(X509_OBJECT *a) { switch (a->type) { default: break; case X509_LU_X509: - X509_up_ref(a->data.x509); - break; + return X509_up_ref(a->data.x509); case X509_LU_CRL: - X509_CRL_up_ref(a->data.crl); - break; + return X509_CRL_up_ref(a->data.crl); } + return 1; } X509 *X509_OBJECT_get0_X509(X509_OBJECT *a) diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c index 360ead87d3..59a6b29f89 100644 --- a/crypto/x509/x509_set.c +++ b/crypto/x509/x509_set.c @@ -146,10 +146,16 @@ int X509_set_pubkey(X509 *x, EVP_PKEY *pkey) return (X509_PUBKEY_set(&(x->cert_info.key), pkey)); } -void X509_up_ref(X509 *x) +int X509_up_ref(X509 *x) { int i; - CRYPTO_atomic_add(&x->references, 1, &i, x->lock); + + if (CRYPTO_atomic_add(&x->references, 1, &i, x->lock) <= 0) + return 0; + + REF_PRINT_COUNT("X509", x); + REF_ASSERT_ISNT(i < 2); + return ((i > 1) ? 1 : 0); } long X509_get_version(X509 *x) diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c index ab5f192a15..d8259254f0 100644 --- a/crypto/x509/x509cset.c +++ b/crypto/x509/x509cset.c @@ -132,10 +132,16 @@ int X509_CRL_sort(X509_CRL *c) return 1; } -void X509_CRL_up_ref(X509_CRL *crl) +int X509_CRL_up_ref(X509_CRL *crl) { int i; - CRYPTO_atomic_add(&crl->references, 1, &i, crl->lock); + + if (CRYPTO_atomic_add(&crl->references, 1, &i, crl->lock) <= 0) + return 0; + + REF_PRINT_COUNT("X509_CRL", crl); + REF_ASSERT_ISNT(i < 2); + return ((i > 1) ? 1 : 0); } long X509_CRL_get_version(X509_CRL *crl) |