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

Add support for reference counting using C11 atomics

Browse source 
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>

GH: #1500
This commit is contained in:
Kurt Roeckx 2016-08-27 16:01:08 +02:00
parent b6c6898234
commit 2f545ae45d
33 changed files with 145 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crypto/bio/bio_lcl.h
View file

@ -9,6 +9,7 @@
#define USE_SOCKETS
#include "e_os.h"
#include "internal/refcount.h"
/* BEGIN BIO_ADDRINFO/BIO_ADDR stuff. */
@ -125,7 +126,7 @@ struct bio_st {
void *ptr;
struct bio_st *next_bio; /* used by filter BIOs */
struct bio_st *prev_bio; /* used by filter BIOs */
int references;
CRYPTO_REF_COUNT references;
uint64_t num_read;
uint64_t num_write;
CRYPTO_EX_DATA ex_data;

4
crypto/bio/bio_lib.c
View file

@ -113,7 +113,7 @@ int BIO_free(BIO *a)
if (a == NULL)
return 0;
if (CRYPTO_atomic_add(&a->references, -1, &ret, a->lock) <= 0)
if (CRYPTO_DOWN_REF(&a->references, &ret, a->lock) <= 0)
return 0;
REF_PRINT_COUNT("BIO", a);
@ -178,7 +178,7 @@ int BIO_up_ref(BIO *a)
{
int i;
if (CRYPTO_atomic_add(&a->references, 1, &i, a->lock) <= 0)
if (CRYPTO_UP_REF(&a->references, &i, a->lock) <= 0)
return 0;
REF_PRINT_COUNT("BIO", a);

4
crypto/bio/bio_meth.c
View file

@ -21,14 +21,14 @@ DEFINE_RUN_ONCE_STATIC(do_bio_type_init)
int BIO_get_new_index()
{
static int bio_count = BIO_TYPE_START;
static CRYPTO_REF_COUNT bio_count = BIO_TYPE_START;
int newval;
if (!RUN_ONCE(&bio_type_init, do_bio_type_init)) {
BIOerr(BIO_F_BIO_GET_NEW_INDEX, ERR_R_MALLOC_FAILURE);
return -1;
}
if (!CRYPTO_atomic_add(&bio_count, 1, &newval, bio_type_lock))
if (!CRYPTO_UP_REF(&bio_count, &newval, bio_type_lock))
return -1;
return newval;
}

4
crypto/dh/dh_lib.c
View file

@ -111,7 +111,7 @@ void DH_free(DH *r)
if (r == NULL)
return;
CRYPTO_atomic_add(&r->references, -1, &i, r->lock);
CRYPTO_DOWN_REF(&r->references, &i, r->lock);
REF_PRINT_COUNT("DH", r);
if (i > 0)
return;
@ -142,7 +142,7 @@ int DH_up_ref(DH *r)
{
int i;
if (CRYPTO_atomic_add(&r->references, 1, &i, r->lock) <= 0)
if (CRYPTO_UP_REF(&r->references, &i, r->lock) <= 0)
return 0;
REF_PRINT_COUNT("DH", r);

3
crypto/dh/dh_locl.h
View file

@ -8,6 +8,7 @@
*/
#include <openssl/dh.h>
#include "internal/refcount.h"
struct dh_st {
/*
@ -29,7 +30,7 @@ struct dh_st {
unsigned char *seed;
int seedlen;
BIGNUM *counter;
int references;
CRYPTO_REF_COUNT references;
CRYPTO_EX_DATA ex_data;
const DH_METHOD *meth;
ENGINE *engine;

4
crypto/dsa/dsa_lib.c
View file

@ -120,7 +120,7 @@ void DSA_free(DSA *r)
if (r == NULL)
return;
CRYPTO_atomic_add(&r->references, -1, &i, r->lock);
CRYPTO_DOWN_REF(&r->references, &i, r->lock);
REF_PRINT_COUNT("DSA", r);
if (i > 0)
return;
@ -148,7 +148,7 @@ int DSA_up_ref(DSA *r)
{
int i;
if (CRYPTO_atomic_add(&r->references, 1, &i, r->lock) <= 0)
if (CRYPTO_UP_REF(&r->references, &i, r->lock) <= 0)
return 0;
REF_PRINT_COUNT("DSA", r);

3
crypto/dsa/dsa_locl.h
View file

@ -8,6 +8,7 @@
*/
#include <openssl/dsa.h>
#include "internal/refcount.h"
struct dsa_st {
/*
@ -24,7 +25,7 @@ struct dsa_st {
int flags;
/* Normally used to cache montgomery values */
BN_MONT_CTX *method_mont_p;
int references;
CRYPTO_REF_COUNT references;
CRYPTO_EX_DATA ex_data;
const DSA_METHOD *meth;
/* functional reference if 'meth' is ENGINE-provided */

4
crypto/dso/dso_lib.c
View file

@ -65,7 +65,7 @@ int DSO_free(DSO *dso)
if (dso == NULL)
return (1);
if (CRYPTO_atomic_add(&dso->references, -1, &i, dso->lock) <= 0)
if (CRYPTO_DOWN_REF(&dso->references, &i, dso->lock) <= 0)
return 0;
REF_PRINT_COUNT("DSO", dso);
@ -107,7 +107,7 @@ int DSO_up_ref(DSO *dso)
return 0;
}
if (CRYPTO_atomic_add(&dso->references, 1, &i, dso->lock) <= 0)
if (CRYPTO_UP_REF(&dso->references, &i, dso->lock) <= 0)
return 0;
REF_PRINT_COUNT("DSO", r);

3
crypto/dso/dso_locl.h
View file

@ -11,6 +11,7 @@
#include "internal/cryptlib.h"
#include "internal/dso.h"
#include "internal/dso_conf.h"
#include "internal/refcount.h"
/**********************************************************************/
/* The low-level handle type used to refer to a loaded shared library */
@ -24,7 +25,7 @@ struct dso_st {
* "Handles" and such go in a STACK.
*/
STACK_OF(void) *meth_data;
int references;
CRYPTO_REF_COUNT references;
int flags;
/*
* For use by applications etc ... use this for your bits'n'pieces, don't

4
crypto/ec/ec_key.c
View file

@ -49,7 +49,7 @@ void EC_KEY_free(EC_KEY *r)
if (r == NULL)
return;
CRYPTO_atomic_add(&r->references, -1, &i, r->lock);
CRYPTO_DOWN_REF(&r->references, &i, r->lock);
REF_PRINT_COUNT("EC_KEY", r);
if (i > 0)
return;
@ -169,7 +169,7 @@ int EC_KEY_up_ref(EC_KEY *r)
{
int i;
if (CRYPTO_atomic_add(&r->references, 1, &i, r->lock) <= 0)
if (CRYPTO_UP_REF(&r->references, &i, r->lock) <= 0)
return 0;
REF_PRINT_COUNT("EC_KEY", r);

3
crypto/ec/ec_lcl.h
View file

@ -26,6 +26,7 @@
#include <openssl/obj_mac.h>
#include <openssl/ec.h>
#include <openssl/bn.h>
#include "internal/refcount.h"
#include "e_os.h"
@ -261,7 +262,7 @@ struct ec_key_st {
BIGNUM *priv_key;
unsigned int enc_flag;
point_conversion_form_t conv_form;
int references;
CRYPTO_REF_COUNT references;
int flags;
CRYPTO_EX_DATA ex_data;
CRYPTO_RWLOCK *lock;

6
crypto/ec/ec_mult.c
View file

@ -38,7 +38,7 @@ struct ec_pre_comp_st {
* generator: 'num' pointers to EC_POINT
* objects followed by a NULL */
size_t num; /* numblocks * 2^(w-1) */
int references;
CRYPTO_REF_COUNT references;
CRYPTO_RWLOCK *lock;
};
@ -73,7 +73,7 @@ EC_PRE_COMP *EC_ec_pre_comp_dup(EC_PRE_COMP *pre)
{
int i;
if (pre != NULL)
CRYPTO_atomic_add(&pre->references, 1, &i, pre->lock);
CRYPTO_UP_REF(&pre->references, &i, pre->lock);
return pre;
}
@ -84,7 +84,7 @@ void EC_ec_pre_comp_free(EC_PRE_COMP *pre)
if (pre == NULL)
return;
CRYPTO_atomic_add(&pre->references, -1, &i, pre->lock);
CRYPTO_DOWN_REF(&pre->references, &i, pre->lock);
REF_PRINT_COUNT("EC_ec", pre);
if (i > 0)
return;

6
crypto/ec/ecp_nistp224.c
View file

@ -236,7 +236,7 @@ static const felem gmul[2][16][3] = {
/* Precomputation for the group generator. */
struct nistp224_pre_comp_st {
felem g_pre_comp[2][16][3];
int references;
CRYPTO_REF_COUNT references;
CRYPTO_RWLOCK *lock;
};
@ -1239,7 +1239,7 @@ NISTP224_PRE_COMP *EC_nistp224_pre_comp_dup(NISTP224_PRE_COMP *p)
{
int i;
if (p != NULL)
CRYPTO_atomic_add(&p->references, 1, &i, p->lock);
CRYPTO_UP_REF(&p->references, &i, p->lock);
return p;
}
@ -1250,7 +1250,7 @@ void EC_nistp224_pre_comp_free(NISTP224_PRE_COMP *p)
if (p == NULL)
return;
CRYPTO_atomic_add(&p->references, -1, &i, p->lock);
CRYPTO_DOWN_REF(&p->references, &i, p->lock);
REF_PRINT_COUNT("EC_nistp224", x);
if (i > 0)
return;

6
crypto/ec/ecp_nistp256.c
View file

@ -1765,7 +1765,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
/* Precomputation for the group generator. */
struct nistp256_pre_comp_st {
smallfelem g_pre_comp[2][16][3];
int references;
CRYPTO_REF_COUNT references;
CRYPTO_RWLOCK *lock;
};
@ -1855,7 +1855,7 @@ NISTP256_PRE_COMP *EC_nistp256_pre_comp_dup(NISTP256_PRE_COMP *p)
{
int i;
if (p != NULL)
CRYPTO_atomic_add(&p->references, 1, &i, p->lock);
CRYPTO_UP_REF(&p->references, &i, p->lock);
return p;
}
@ -1866,7 +1866,7 @@ void EC_nistp256_pre_comp_free(NISTP256_PRE_COMP *pre)
if (pre == NULL)
return;
CRYPTO_atomic_add(&pre->references, -1, &i, pre->lock);
CRYPTO_DOWN_REF(&pre->references, &i, pre->lock);
REF_PRINT_COUNT("EC_nistp256", x);
if (i > 0)
return;

6
crypto/ec/ecp_nistp521.c
View file

@ -1594,7 +1594,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
/* Precomputation for the group generator. */
struct nistp521_pre_comp_st {
felem g_pre_comp[16][3];
int references;
CRYPTO_REF_COUNT references;
CRYPTO_RWLOCK *lock;
};
@ -1684,7 +1684,7 @@ NISTP521_PRE_COMP *EC_nistp521_pre_comp_dup(NISTP521_PRE_COMP *p)
{
int i;
if (p != NULL)
CRYPTO_atomic_add(&p->references, 1, &i, p->lock);
CRYPTO_UP_REF(&p->references, &i, p->lock);
return p;
}
@ -1695,7 +1695,7 @@ void EC_nistp521_pre_comp_free(NISTP521_PRE_COMP *p)
if (p == NULL)
return;
CRYPTO_atomic_add(&p->references, -1, &i, p->lock);
CRYPTO_DOWN_REF(&p->references, &i, p->lock);
REF_PRINT_COUNT("EC_nistp521", x);
if (i > 0)
return;

6
crypto/ec/ecp_nistz256.c
View file

@ -84,7 +84,7 @@ struct nistz256_pre_comp_st {
*/
PRECOMP256_ROW *precomp;
void *precomp_storage;
int references;
CRYPTO_REF_COUNT references;
CRYPTO_RWLOCK *lock;
};
@ -1477,7 +1477,7 @@ NISTZ256_PRE_COMP *EC_nistz256_pre_comp_dup(NISTZ256_PRE_COMP *p)
{
int i;
if (p != NULL)
CRYPTO_atomic_add(&p->references, 1, &i, p->lock);
CRYPTO_UP_REF(&p->references, &i, p->lock);
return p;
}
@ -1488,7 +1488,7 @@ void EC_nistz256_pre_comp_free(NISTZ256_PRE_COMP *pre)
if (pre == NULL)
return;
CRYPTO_atomic_add(&pre->references, -1, &i, pre->lock);
CRYPTO_DOWN_REF(&pre->references, &i, pre->lock);
REF_PRINT_COUNT("EC_nistz256", x);
if (i > 0)
return;

3
crypto/engine/eng_int.h
View file

@ -19,6 +19,7 @@
# include "internal/cryptlib.h"
# include <internal/engine.h>
# include <internal/thread_once.h>
# include "internal/refcount.h"
#ifdef __cplusplus
extern "C" {
@ -156,7 +157,7 @@ struct engine_st {
const ENGINE_CMD_DEFN *cmd_defns;
int flags;
/* reference count on the structure itself */
int struct_ref;
CRYPTO_REF_COUNT struct_ref;
/*
* reference count on usability of the engine type. NB: This controls the
* loading and initialisation of any functionality required by this

5
crypto/engine/eng_lib.c
View file

@ -9,6 +9,7 @@
#include "eng_int.h"
#include <openssl/rand.h>
#include "internal/refcount.h"
CRYPTO_RWLOCK *global_engine_lock;
@ -72,10 +73,14 @@ int engine_free_util(ENGINE *e, int locked)
if (e == NULL)
return 1;
#ifdef HAVE_ATOMICS
CRYPTO_DOWN_REF(&e->struct_ref, &i, global_engine_lock);
#else
if (locked)
CRYPTO_atomic_add(&e->struct_ref, -1, &i, global_engine_lock);
else
i = --e->struct_ref;
#endif
engine_ref_debug(e, 0, -1)
if (i > 0)
return 1;

2
crypto/engine/eng_list.c
View file

@ -349,6 +349,6 @@ int ENGINE_up_ref(ENGINE *e)
ENGINEerr(ENGINE_F_ENGINE_UP_REF, ERR_R_PASSED_NULL_PARAMETER);
return 0;
}
CRYPTO_atomic_add(&e->struct_ref, 1, &i, global_engine_lock);
CRYPTO_UP_REF(&e->struct_ref, &i, global_engine_lock);
return 1;
}

4
crypto/evp/p_lib.c
View file

@ -160,7 +160,7 @@ int EVP_PKEY_up_ref(EVP_PKEY *pkey)
{
int i;
if (CRYPTO_atomic_add(&pkey->references, 1, &i, pkey->lock) <= 0)
if (CRYPTO_UP_REF(&pkey->references, &i, pkey->lock) <= 0)
return 0;
REF_PRINT_COUNT("EVP_PKEY", pkey);
@ -392,7 +392,7 @@ void EVP_PKEY_free(EVP_PKEY *x)
if (x == NULL)
return;
CRYPTO_atomic_add(&x->references, -1, &i, x->lock);
CRYPTO_DOWN_REF(&x->references, &i, x->lock);
REF_PRINT_COUNT("EVP_PKEY", x);
if (i > 0)
return;

4
crypto/include/internal/evp_int.h
View file

@ -7,6 +7,8 @@
* https://www.openssl.org/source/license.html
*/
#include "internal/refcount.h"
struct evp_pkey_ctx_st {
/* Method associated with this operation */
const EVP_PKEY_METHOD *pmeth;
@ -353,7 +355,7 @@ const EVP_CIPHER *EVP_##cname##_ecb(void) { return &cname##_ecb; }
struct evp_pkey_st {
int type;
int save_type;
int references;
CRYPTO_REF_COUNT references;
const EVP_PKEY_ASN1_METHOD *ameth;
ENGINE *engine;
union {

8
crypto/include/internal/x509_int.h
View file

@ -7,6 +7,8 @@
* https://www.openssl.org/source/license.html
*/
#include "internal/refcount.h"
/* Internal X509 structures and functions: not for application use */
/* Note: unless otherwise stated a field pointer is mandatory and should
@ -54,7 +56,7 @@ struct X509_req_st {
X509_REQ_INFO req_info; /* signed certificate request data */
X509_ALGOR sig_alg; /* signature algorithm */
ASN1_BIT_STRING *signature; /* signature */
int references;
CRYPTO_REF_COUNT references;
CRYPTO_RWLOCK *lock;
};
@ -73,7 +75,7 @@ struct X509_crl_st {
X509_CRL_INFO crl; /* signed CRL data */
X509_ALGOR sig_alg; /* CRL signature algorithm */
ASN1_BIT_STRING signature; /* CRL signature */
int references;
CRYPTO_REF_COUNT references;
int flags;
/*
* Cached copies of decoded extension values, since extensions
@ -144,7 +146,7 @@ struct x509_st {
X509_CINF cert_info;
X509_ALGOR sig_alg;
ASN1_BIT_STRING signature;
int references;
CRYPTO_REF_COUNT references;
CRYPTO_EX_DATA ex_data;
/* These contain copies of various extension values */
long ex_pathlen;

4
crypto/rsa/rsa_lib.c
View file

@ -128,7 +128,7 @@ void RSA_free(RSA *r)
if (r == NULL)
return;
CRYPTO_atomic_add(&r->references, -1, &i, r->lock);
CRYPTO_DOWN_REF(&r->references, &i, r->lock);
REF_PRINT_COUNT("RSA", r);
if (i > 0)
return;
@ -162,7 +162,7 @@ int RSA_up_ref(RSA *r)
{
int i;
if (CRYPTO_atomic_add(&r->references, 1, &i, r->lock) <= 0)
if (CRYPTO_UP_REF(&r->references, &i, r->lock) <= 0)
return 0;
REF_PRINT_COUNT("RSA", r);

3
crypto/rsa/rsa_locl.h
View file

@ -8,6 +8,7 @@
*/
#include <openssl/rsa.h>
#include "internal/refcount.h"
struct rsa_st {
/*
@ -29,7 +30,7 @@ struct rsa_st {
BIGNUM *iqmp;
/* be careful using this if the RSA structure is shared */
CRYPTO_EX_DATA ex_data;
int references;
CRYPTO_REF_COUNT references;
int flags;
/* Used to cache montgomery values */
BN_MONT_CTX *_method_mod_n;

4
crypto/x509/x509_lcl.h
View file

@ -7,6 +7,8 @@
* https://www.openssl.org/source/license.html
*/
#include "internal/refcount.h"
/*
* This structure holds all parameters associated with a verify operation by
* including an X509_VERIFY_PARAM structure in related structures the
@ -130,7 +132,7 @@ struct x509_store_st {
STACK_OF(X509_CRL) *(*lookup_crls) (X509_STORE_CTX *ctx, X509_NAME *nm);
int (*cleanup) (X509_STORE_CTX *ctx);
CRYPTO_EX_DATA ex_data;
int references;
CRYPTO_REF_COUNT references;
CRYPTO_RWLOCK *lock;
};

4
crypto/x509/x509_lu.c
View file

@ -196,7 +196,7 @@ void X509_STORE_free(X509_STORE *vfy)
if (vfy == NULL)
return;
CRYPTO_atomic_add(&vfy->references, -1, &i, vfy->lock);
CRYPTO_DOWN_REF(&vfy->references, &i, vfy->lock);
REF_PRINT_COUNT("X509_STORE", vfy);
if (i > 0)
return;
@ -221,7 +221,7 @@ int X509_STORE_up_ref(X509_STORE *vfy)
{
int i;
if (CRYPTO_atomic_add(&vfy->references, 1, &i, vfy->lock) <= 0)
if (CRYPTO_UP_REF(&vfy->references, &i, vfy->lock) <= 0)
return 0;
REF_PRINT_COUNT("X509_STORE", a);

2
crypto/x509/x509_set.c
View file

@ -96,7 +96,7 @@ int X509_up_ref(X509 *x)
{
int i;
if (CRYPTO_atomic_add(&x->references, 1, &i, x->lock) <= 0)
if (CRYPTO_UP_REF(&x->references, &i, x->lock) <= 0)
return 0;
REF_PRINT_COUNT("X509", x);

2
crypto/x509/x509cset.c
View file

@ -67,7 +67,7 @@ int X509_CRL_up_ref(X509_CRL *crl)
{
int i;
if (CRYPTO_atomic_add(&crl->references, 1, &i, crl->lock) <= 0)
if (CRYPTO_UP_REF(&crl->references, &i, crl->lock) <= 0)
return 0;
REF_PRINT_COUNT("X509_CRL", crl);

65
include/internal/refcount.h Normal file
View file

@ -0,0 +1,65 @@
/*
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/
#ifndef HEADER_INTERNAL_REFCOUNT_H
# define HEADER_INTERNAL_REFCOUNT_H
# if __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
# include <stdatomic.h>
# define HAVE_C11_ATOMICS
# endif
# if defined(HAVE_C11_ATOMICS) && ATOMIC_INT_LOCK_FREE > 0
# define HAVE_ATOMICS 1
typedef _Atomic int CRYPTO_REF_COUNT;
static ossl_inline int CRYPTO_UP_REF(_Atomic int *val, int *ret, void *lock)
{
*ret = atomic_fetch_add_explicit(val, 1, memory_order_relaxed) + 1;
return 1;
}
static ossl_inline int CRYPTO_DOWN_REF(_Atomic int *val, int *ret, void *lock)
{
*ret = atomic_fetch_sub_explicit(val, 1, memory_order_release) - 1;
if (*ret == 0)
atomic_thread_fence(memory_order_acquire);
return 1;
}
# elif defined(__GNUC__) && defined(__ATOMIC_RELAXED) && __GCC_ATOMIC_INT_LOCK_FREE > 0
# define HAVE_ATOMICS 1
typedef int CRYPTO_REF_COUNT;
static ossl_inline int CRYPTO_UP_REF(int *val, int *ret, void *lock)
{
*ret = __atomic_fetch_add(val, 1, __ATOMIC_RELAXED) + 1;
return 1;
}
static ossl_inline int CRYPTO_DOWN_REF(int *val, int *ret, void *lock)
{
*ret = __atomic_fetch_sub(val, 1, __ATOMIC_RELEASE) - 1;
if (*ret == 0)
__atomic_thread_fence(__ATOMIC_ACQUIRE);
return 1;
}
# else
typedef int CRYPTO_REF_COUNT;
# define CRYPTO_UP_REF(val, ret, lock) CRYPTO_atomic_add(val, 1, ret, lock)
# define CRYPTO_DOWN_REF(val, ret, lock) CRYPTO_atomic_add(val, -1, ret, lock)
# endif
#endif

2
ssl/ssl_cert.c
View file

@ -235,7 +235,7 @@ void ssl_cert_free(CERT *c)
if (c == NULL)
return;
CRYPTO_atomic_add(&c->references, -1, &i, c->lock);
CRYPTO_DOWN_REF(&c->references, &i, c->lock);
REF_PRINT_COUNT("CERT", c);
if (i > 0)
return;

12
ssl/ssl_lib.c
View file

@ -682,7 +682,7 @@ int SSL_up_ref(SSL *s)
{
int i;
if (CRYPTO_atomic_add(&s->references, 1, &i, s->lock) <= 0)
if (CRYPTO_UP_REF(&s->references, &i, s->lock) <= 0)
return 0;
REF_PRINT_COUNT("SSL", s);
@ -965,7 +965,7 @@ void SSL_free(SSL *s)
if (s == NULL)
return;
CRYPTO_atomic_add(&s->references, -1, &i, s->lock);
CRYPTO_DOWN_REF(&s->references, &i, s->lock);
REF_PRINT_COUNT("SSL", s);
if (i > 0)
return;
@ -1379,7 +1379,7 @@ int SSL_copy_session_id(SSL *t, const SSL *f)
return 0;
}
CRYPTO_atomic_add(&f->cert->references, 1, &i, f->cert->lock);
CRYPTO_UP_REF(&f->cert->references, &i, f->cert->lock);
ssl_cert_free(t->cert);
t->cert = f->cert;
if (!SSL_set_session_id_context(t, f->sid_ctx, (int)f->sid_ctx_length)) {
@ -2570,7 +2570,7 @@ int SSL_CTX_up_ref(SSL_CTX *ctx)
{
int i;
if (CRYPTO_atomic_add(&ctx->references, 1, &i, ctx->lock) <= 0)
if (CRYPTO_UP_REF(&ctx->references, &i, ctx->lock) <= 0)
return 0;
REF_PRINT_COUNT("SSL_CTX", ctx);
@ -2585,7 +2585,7 @@ void SSL_CTX_free(SSL_CTX *a)
if (a == NULL)
return;
CRYPTO_atomic_add(&a->references, -1, &i, a->lock);
CRYPTO_DOWN_REF(&a->references, &i, a->lock);
REF_PRINT_COUNT("SSL_CTX", a);
if (i > 0)
return;
@ -3199,7 +3199,7 @@ SSL *SSL_dup(SSL *s)
/* If we're not quiescent, just up_ref! */
if (!SSL_in_init(s) || !SSL_in_before(s)) {
CRYPTO_atomic_add(&s->references, 1, &i, s->lock);
CRYPTO_UP_REF(&s->references, &i, s->lock);
return s;
}

9
ssl/ssl_locl.h
View file

@ -66,6 +66,7 @@
# include "statem/statem.h"
# include "packet_locl.h"
# include "internal/dane.h"
# include "internal/refcount.h"
# ifdef OPENSSL_BUILD_SHLIBSSL
# undef OPENSSL_EXTERN
@ -536,7 +537,7 @@ struct ssl_session_st {
* certificate is not ok, we must remember the error for session reuse:
*/
long verify_result; /* only for servers */
int references;
CRYPTO_REF_COUNT references;
long timeout;
long time;
unsigned int compress_meth; /* Need to lookup the method */
@ -663,7 +664,7 @@ struct ssl_ctx_st {
* :-) */
} stats;
int references;
CRYPTO_REF_COUNT references;
/* if defined, these override the X509_verify_cert() calls */
int (*app_verify_callback) (X509_STORE_CTX *, void *);
@ -1006,7 +1007,7 @@ struct ssl_st {
CRYPTO_EX_DATA ex_data;
/* for server side, keep the list of CA_dn we can use */
STACK_OF(X509_NAME) *client_CA;
int references;
CRYPTO_REF_COUNT references;
/* protocol behaviour */
uint32_t options;
/* API behaviour */
@ -1543,7 +1544,7 @@ typedef struct cert_st {
/* If not NULL psk identity hint to use for servers */
char *psk_identity_hint;
# endif
int references; /* >1 only if SSL_copy_session_id is used */
CRYPTO_REF_COUNT references; /* >1 only if SSL_copy_session_id is used */
CRYPTO_RWLOCK *lock;
} CERT;

4
ssl/ssl_sess.c
View file

@ -752,7 +752,7 @@ void SSL_SESSION_free(SSL_SESSION *ss)
if (ss == NULL)
return;
CRYPTO_atomic_add(&ss->references, -1, &i, ss->lock);
CRYPTO_DOWN_REF(&ss->references, &i, ss->lock);
REF_PRINT_COUNT("SSL_SESSION", ss);
if (i > 0)
return;
@ -788,7 +788,7 @@ int SSL_SESSION_up_ref(SSL_SESSION *ss)
{
int i;
if (CRYPTO_atomic_add(&ss->references, 1, &i, ss->lock) <= 0)
if (CRYPTO_UP_REF(&ss->references, &i, ss->lock) <= 0)
return 0;
REF_PRINT_COUNT("SSL_SESSION", ss);