diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-08-31 20:30:20 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-08-31 23:18:54 +0100 |
| commit | 65cbf983ca4f69b8954f949c2edaaa48824481b3 (patch) | |
| tree | 00e276634405fbab27f99c8879fcf7f2a77cb111 /crypto/x509 | |
| parent | a7e974c7be90e2c9673e2ce6215a70f734eb8ad4 (diff) | |
| download | openssl-65cbf983ca4f69b8954f949c2edaaa48824481b3.tar.gz | |
Add X509_CRL_up_ref function
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509_lu.c | 4 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.c | 4 | ||||
| -rw-r--r-- | crypto/x509/x509cset.c | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index ae46df8449..d8ba14c39a 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -409,7 +409,7 @@ void X509_OBJECT_up_ref_count(X509_OBJECT *a) CRYPTO_add(&a->data.x509->references, 1, CRYPTO_LOCK_X509); break; case X509_LU_CRL: - CRYPTO_add(&a->data.crl->references, 1, CRYPTO_LOCK_X509_CRL); + X509_CRL_up_ref(a->data.crl); break; } } @@ -565,7 +565,7 @@ STACK_OF(X509_CRL) *X509_STORE_get1_crls(X509_STORE_CTX *ctx, X509_NAME *nm) for (i = 0; i < cnt; i++, idx++) { obj = sk_X509_OBJECT_value(ctx->ctx->objs, idx); x = obj->data.crl; - CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL); + X509_CRL_up_ref(x); if (!sk_X509_CRL_push(sk, x)) { CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE); X509_CRL_free(x); diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index a3077b5cbc..332a8c0f6c 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -1025,7 +1025,7 @@ static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509_CRL **pdcrl, *pissuer = best_crl_issuer; *pscore = best_score; *preasons = best_reasons; - CRYPTO_add(&best_crl->references, 1, CRYPTO_LOCK_X509_CRL); + X509_CRL_up_ref(best_crl); X509_CRL_free(*pdcrl); *pdcrl = NULL; get_delta_sk(ctx, pdcrl, pscore, best_crl, crls); @@ -1123,7 +1123,7 @@ static void get_delta_sk(X509_STORE_CTX *ctx, X509_CRL **dcrl, int *pscore, if (check_delta_base(delta, base)) { if (check_crl_time(ctx, delta, 0)) *pscore |= CRL_SCORE_TIME_DELTA; - CRYPTO_add(&delta->references, 1, CRYPTO_LOCK_X509_CRL); + X509_CRL_up_ref(delta); *dcrl = delta; return; } diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c index 925ba69250..c6873240af 100644 --- a/crypto/x509/x509cset.c +++ b/crypto/x509/x509cset.c @@ -132,6 +132,11 @@ int X509_CRL_sort(X509_CRL *c) return 1; } +void X509_CRL_up_ref(X509_CRL *crl) +{ + CRYPTO_add(&crl->references, 1, CRYPTO_LOCK_X509_CRL); +} + int X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm) { ASN1_TIME *in; |