diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-07-02 14:57:36 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-07-02 16:30:56 +0200 |
| commit | 7c95390ef021e18d6b834cea9009d0d26b4642d5 (patch) | |
| tree | 2aa4a2a481661f863670135b51f628939bba1cc9 /crypto/evp | |
| parent | 94f4d58a87eac9c6fe4cb46b998656bd6d6f03a5 (diff) | |
ossl_provider_upref to ossl_provider_up_ref
Common pattern is that the routines to increment the reference count
are called something_up_ref, not something_upref. Adapt
ossl_provider_upref() accordingly.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9293)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/digest.c | 2 | ||||
| -rw-r--r-- | crypto/evp/evp_enc.c | 2 | ||||
| -rw-r--r-- | crypto/evp/evp_fetch.c | 6 | ||||
| -rw-r--r-- | crypto/evp/evp_locl.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index f26caedd5b..65b12e315a 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -660,7 +660,7 @@ static void *evp_md_from_dispatch(const OSSL_DISPATCH *fns, } md->prov = prov; if (prov != NULL) - ossl_provider_upref(prov); + ossl_provider_up_ref(prov); return md; } diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index e7bebdcc1d..ebe7fa8fac 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -1174,7 +1174,7 @@ static void *evp_cipher_from_dispatch(const OSSL_DISPATCH *fns, } cipher->prov = prov; if (prov != NULL) - ossl_provider_upref(prov); + ossl_provider_up_ref(prov); return cipher; } diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c index e785474372..0c25f0d558 100644 --- a/crypto/evp/evp_fetch.c +++ b/crypto/evp/evp_fetch.c @@ -157,7 +157,7 @@ void *evp_generic_fetch(OPENSSL_CTX *libctx, int operation_id, const char *name, const char *properties, void *(*new_method)(const OSSL_DISPATCH *fns, OSSL_PROVIDER *prov), - int (*upref_method)(void *), + int (*up_ref_method)(void *), void (*free_method)(void *)) { OSSL_METHOD_STORE *store = get_default_method_store(libctx); @@ -203,7 +203,7 @@ void *evp_generic_fetch(OPENSSL_CTX *libctx, int operation_id, mcmdata.name = name; mcmdata.method_from_dispatch = new_method; mcmdata.destruct_method = free_method; - mcmdata.refcnt_up_method = upref_method; + mcmdata.refcnt_up_method = up_ref_method; mcmdata.destruct_method = free_method; if ((method = ossl_method_construct(libctx, operation_id, name, properties, 0 /* !force_cache */, @@ -219,7 +219,7 @@ void *evp_generic_fetch(OPENSSL_CTX *libctx, int operation_id, ossl_method_store_cache_set(store, methid, properties, method); } } else { - upref_method(method); + up_ref_method(method); } return method; diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h index 8876b061af..fdafe4f281 100644 --- a/crypto/evp/evp_locl.h +++ b/crypto/evp/evp_locl.h @@ -93,5 +93,5 @@ void *evp_generic_fetch(OPENSSL_CTX *ctx, int operation_id, const char *algorithm, const char *properties, void *(*new_method)(const OSSL_DISPATCH *fns, OSSL_PROVIDER *prov), - int (*upref_method)(void *), + int (*up_ref_method)(void *), void (*free_method)(void *)); |