diff options
author | Pauli <paul.dale@oracle.com> | 2020-09-28 12:47:04 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-09-29 16:33:16 +1000 |
commit | 7d6766cb537e5cebc99e200bc537f744878a87a4 (patch) | |
tree | db9fbd45925e6735deb25b4b1a44771a107c003e /providers/common | |
parent | 1be63951f87dfcbc98efe5d94a15298fea885890 (diff) |
prov: prefix provider internal functions with ossl_
Also convert the names to lower case.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13014)
Diffstat (limited to 'providers/common')
-rw-r--r-- | providers/common/bio_prov.c | 2 | ||||
-rw-r--r-- | providers/common/include/prov/provider_ctx.h | 18 | ||||
-rw-r--r-- | providers/common/provider_ctx.c | 16 |
3 files changed, 18 insertions, 18 deletions
diff --git a/providers/common/bio_prov.c b/providers/common/bio_prov.c index c049795cd1..afdeb80d80 100644 --- a/providers/common/bio_prov.c +++ b/providers/common/bio_prov.c @@ -213,7 +213,7 @@ BIO_METHOD *bio_prov_init_bio_method(void) BIO *bio_new_from_core_bio(PROV_CTX *provctx, OSSL_CORE_BIO *corebio) { BIO *outbio; - BIO_METHOD *corebiometh = PROV_CTX_get0_core_bio_method(provctx); + BIO_METHOD *corebiometh = ossl_prov_ctx_get0_core_bio_method(provctx); if (corebiometh == NULL) return NULL; diff --git a/providers/common/include/prov/provider_ctx.h b/providers/common/include/prov/provider_ctx.h index a252143e81..c650777280 100644 --- a/providers/common/include/prov/provider_ctx.h +++ b/providers/common/include/prov/provider_ctx.h @@ -26,15 +26,15 @@ typedef struct prov_ctx_st { * fetching functions. */ # define PROV_LIBRARY_CONTEXT_OF(provctx) \ - PROV_CTX_get0_library_context((provctx)) + ossl_prov_ctx_get0_library_context((provctx)) -PROV_CTX *PROV_CTX_new(void); -void PROV_CTX_free(PROV_CTX *ctx); -void PROV_CTX_set0_library_context(PROV_CTX *ctx, OPENSSL_CTX *libctx); -void PROV_CTX_set0_handle(PROV_CTX *ctx, const OSSL_CORE_HANDLE *handle); -void PROV_CTX_set0_core_bio_method(PROV_CTX *ctx, BIO_METHOD *corebiometh); -OPENSSL_CTX *PROV_CTX_get0_library_context(PROV_CTX *ctx); -const OSSL_CORE_HANDLE *PROV_CTX_get0_handle(PROV_CTX *ctx); -BIO_METHOD *PROV_CTX_get0_core_bio_method(PROV_CTX *ctx); +PROV_CTX *ossl_prov_ctx_new(void); +void ossl_prov_ctx_free(PROV_CTX *ctx); +void ossl_prov_ctx_set0_library_context(PROV_CTX *ctx, OPENSSL_CTX *libctx); +void ossl_prov_ctx_set0_handle(PROV_CTX *ctx, const OSSL_CORE_HANDLE *handle); +void ossl_prov_ctx_set0_core_bio_method(PROV_CTX *ctx, BIO_METHOD *corebiometh); +OPENSSL_CTX *ossl_prov_ctx_get0_library_context(PROV_CTX *ctx); +const OSSL_CORE_HANDLE *ossl_prov_ctx_get0_handle(PROV_CTX *ctx); +BIO_METHOD *ossl_prov_ctx_get0_core_bio_method(PROV_CTX *ctx); #endif diff --git a/providers/common/provider_ctx.c b/providers/common/provider_ctx.c index 04cca1f23e..6d81c20981 100644 --- a/providers/common/provider_ctx.c +++ b/providers/common/provider_ctx.c @@ -11,49 +11,49 @@ #include "prov/provider_ctx.h" #include "prov/bio.h" -PROV_CTX *PROV_CTX_new(void) +PROV_CTX *ossl_prov_ctx_new(void) { return OPENSSL_zalloc(sizeof(PROV_CTX)); } -void PROV_CTX_free(PROV_CTX *ctx) +void ossl_prov_ctx_free(PROV_CTX *ctx) { OPENSSL_free(ctx); } -void PROV_CTX_set0_library_context(PROV_CTX *ctx, OPENSSL_CTX *libctx) +void ossl_prov_ctx_set0_library_context(PROV_CTX *ctx, OPENSSL_CTX *libctx) { if (ctx != NULL) ctx->libctx = libctx; } -void PROV_CTX_set0_handle(PROV_CTX *ctx, const OSSL_CORE_HANDLE *handle) +void ossl_prov_ctx_set0_handle(PROV_CTX *ctx, const OSSL_CORE_HANDLE *handle) { if (ctx != NULL) ctx->handle = handle; } -void PROV_CTX_set0_core_bio_method(PROV_CTX *ctx, BIO_METHOD *corebiometh) +void ossl_prov_ctx_set0_core_bio_method(PROV_CTX *ctx, BIO_METHOD *corebiometh) { if (ctx != NULL) ctx->corebiometh = corebiometh; } -OPENSSL_CTX *PROV_CTX_get0_library_context(PROV_CTX *ctx) +OPENSSL_CTX *ossl_prov_ctx_get0_library_context(PROV_CTX *ctx) { if (ctx == NULL) return NULL; return ctx->libctx; } -const OSSL_CORE_HANDLE *PROV_CTX_get0_handle(PROV_CTX *ctx) +const OSSL_CORE_HANDLE *ossl_prov_ctx_get0_handle(PROV_CTX *ctx) { if (ctx == NULL) return NULL; return ctx->handle; } -BIO_METHOD *PROV_CTX_get0_core_bio_method(PROV_CTX *ctx) +BIO_METHOD *ossl_prov_ctx_get0_core_bio_method(PROV_CTX *ctx) { if (ctx == NULL) return NULL; |