diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-08-31 20:29:57 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-08-31 23:18:55 +0100 |
| commit | 05f0fb9f6acc34c82a082d7668572828925694e7 (patch) | |
| tree | abed16eae5af33da7021280eb40f4db3f468849e /ssl | |
| parent | 65cbf983ca4f69b8954f949c2edaaa48824481b3 (diff) | |
Add X509_up_ref function.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_clnt.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_cert.c | 4 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_rsa.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index e7bbfc90ed..ba35fb9ca5 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -1359,7 +1359,7 @@ int ssl3_get_server_certificate(SSL *s) s->session->peer_type = i; X509_free(s->session->peer); - CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); + X509_up_ref(x); s->session->peer = x; s->session->verify_result = s->verify_result; diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 5e9b8ffe7a..11839612f2 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -250,7 +250,7 @@ CERT *ssl_cert_dup(CERT *cert) CERT_PKEY *rpk = ret->pkeys + i; if (cpk->x509 != NULL) { rpk->x509 = cpk->x509; - CRYPTO_add(&rpk->x509->references, 1, CRYPTO_LOCK_X509); + X509_up_ref(rpk->x509); } if (cpk->privatekey != NULL) { @@ -463,7 +463,7 @@ int ssl_cert_add1_chain_cert(SSL *s, SSL_CTX *ctx, X509 *x) { if (!ssl_cert_add0_chain_cert(s, ctx, x)) return 0; - CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); + X509_up_ref(x); return 1; } diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 2a2eb7827c..fd1561e52d 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -825,7 +825,7 @@ X509 *SSL_get_peer_certificate(const SSL *s) if (r == NULL) return (r); - CRYPTO_add(&r->references, 1, CRYPTO_LOCK_X509); + X509_up_ref(r); return (r); } diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index f4851266a1..6772441d10 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -415,7 +415,7 @@ static int ssl_set_cert(CERT *c, X509 *x) EVP_PKEY_free(pkey); X509_free(c->pkeys[i].x509); - CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); + X509_up_ref(x); c->pkeys[i].x509 = x; c->key = &(c->pkeys[i]); diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 26a3c43f24..69e6d7fea5 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -266,7 +266,7 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) dest->references = 1; if (src->peer != NULL) - CRYPTO_add(&src->peer->references, 1, CRYPTO_LOCK_X509); + X509_up_ref(src->peer); if (src->peer_chain != NULL) { dest->peer_chain = X509_chain_up_ref(src->peer_chain); |