diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-10-15 12:55:50 +0300 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-15 11:59:53 +0100 |
| commit | b425001010044adbdbcd98f8682694b30b73bbf4 (patch) | |
| tree | e87a5b512d7869cb6a500ecc74b706281be762cf /crypto/async | |
| parent | 29000e43ea257bf54f6ccb2064b3744853b821b2 (diff) | |
Rename OPENSSL_CTX prefix to OSSL_LIB_CTX
Many of the new types introduced by OpenSSL 3.0 have an OSSL_ prefix,
e.g., OSSL_CALLBACK, OSSL_PARAM, OSSL_ALGORITHM, OSSL_SERIALIZER.
The OPENSSL_CTX type stands out a little by using a different prefix.
For consistency reasons, this type is renamed to OSSL_LIB_CTX.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12621)
Diffstat (limited to 'crypto/async')
| -rw-r--r-- | crypto/async/async.c | 10 | ||||
| -rw-r--r-- | crypto/async/async_local.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/async/async.c b/crypto/async/async.c index b30f516d05..8eedad97ea 100644 --- a/crypto/async/async.c +++ b/crypto/async/async.c @@ -170,7 +170,7 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, int (*func)(void *), void *args, size_t size) { async_ctx *ctx; - OPENSSL_CTX *libctx; + OSSL_LIB_CTX *libctx; if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) return ASYNC_ERR; @@ -208,7 +208,7 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, * Restore the default libctx to what it was the last time the * fibre ran */ - libctx = OPENSSL_CTX_set0_default(ctx->currjob->libctx); + libctx = OSSL_LIB_CTX_set0_default(ctx->currjob->libctx); /* Resume previous job */ if (!async_fibre_swapcontext(&ctx->dispatcher, &ctx->currjob->fibrectx, 1)) { @@ -221,7 +221,7 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, * again to what it was originally, and remember what it had * been changed to. */ - ctx->currjob->libctx = OPENSSL_CTX_set0_default(libctx); + ctx->currjob->libctx = OSSL_LIB_CTX_set0_default(libctx); continue; } @@ -252,7 +252,7 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, ctx->currjob->func = func; ctx->currjob->waitctx = wctx; - libctx = openssl_ctx_get_concrete(NULL); + libctx = ossl_lib_ctx_get_concrete(NULL); if (!async_fibre_swapcontext(&ctx->dispatcher, &ctx->currjob->fibrectx, 1)) { ASYNCerr(ASYNC_F_ASYNC_START_JOB, ASYNC_R_FAILED_TO_SWAP_CONTEXT); @@ -262,7 +262,7 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret, * In case the fibre changed the default libctx we set it back again * to what it was, and remember what it had been changed to. */ - ctx->currjob->libctx = OPENSSL_CTX_set0_default(libctx); + ctx->currjob->libctx = OSSL_LIB_CTX_set0_default(libctx); } err: diff --git a/crypto/async/async_local.h b/crypto/async/async_local.h index 8caa71cef4..c06f413cf6 100644 --- a/crypto/async/async_local.h +++ b/crypto/async/async_local.h @@ -43,7 +43,7 @@ struct async_job_st { int ret; int status; ASYNC_WAIT_CTX *waitctx; - OPENSSL_CTX *libctx; + OSSL_LIB_CTX *libctx; }; struct fd_lookup_st { |