diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-10-15 11:55:50 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-15 12:59:53 +0200 |
| commit | b425001010044adbdbcd98f8682694b30b73bbf4 (patch) | |
| tree | e87a5b512d7869cb6a500ecc74b706281be762cf /crypto/cmp | |
| parent | Make evp_pkey_ctx_get0_libctx/propq public API (diff) | |
| download | openssl-b425001010044adbdbcd98f8682694b30b73bbf4.tar.xz openssl-b425001010044adbdbcd98f8682694b30b73bbf4.zip | |
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/cmp')
| -rw-r--r-- | crypto/cmp/cmp_ctx.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_local.h | 4 | ||||
| -rw-r--r-- | crypto/cmp/cmp_server.c | 2 | ||||
| -rw-r--r-- | crypto/cmp/cmp_util.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c index d960167bc0..97d76f0223 100644 --- a/crypto/cmp/cmp_ctx.c +++ b/crypto/cmp/cmp_ctx.c @@ -101,7 +101,7 @@ static int cmp_ctx_set_md(OSSL_CMP_CTX *ctx, EVP_MD **pmd, int nid) * Allocates and initializes OSSL_CMP_CTX context structure with default values. * Returns new context on success, NULL on error */ -OSSL_CMP_CTX *OSSL_CMP_CTX_new(OPENSSL_CTX *libctx, const char *propq) +OSSL_CMP_CTX *OSSL_CMP_CTX_new(OSSL_LIB_CTX *libctx, const char *propq) { OSSL_CMP_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx)); diff --git a/crypto/cmp/cmp_local.h b/crypto/cmp/cmp_local.h index 434f9e093f..c615865864 100644 --- a/crypto/cmp/cmp_local.h +++ b/crypto/cmp/cmp_local.h @@ -28,7 +28,7 @@ * this structure is used to store the context for CMP sessions */ struct ossl_cmp_ctx_st { - OPENSSL_CTX *libctx; + OSSL_LIB_CTX *libctx; const char *propq; OSSL_CMP_log_cb_t log_cb; /* log callback for error/debug/etc. output */ OSSL_CMP_severity log_verbosity; /* level of verbosity of log output */ @@ -747,7 +747,7 @@ int ossl_cmp_asn1_octet_string_set1(ASN1_OCTET_STRING **tgt, int ossl_cmp_asn1_octet_string_set1_bytes(ASN1_OCTET_STRING **tgt, const unsigned char *bytes, int len); STACK_OF(X509) - *ossl_cmp_build_cert_chain(OPENSSL_CTX *libctx, const char *propq, + *ossl_cmp_build_cert_chain(OSSL_LIB_CTX *libctx, const char *propq, X509_STORE *store, STACK_OF(X509) *certs, X509 *cert); diff --git a/crypto/cmp/cmp_server.c b/crypto/cmp/cmp_server.c index e9ddf496f2..102fe232f2 100644 --- a/crypto/cmp/cmp_server.c +++ b/crypto/cmp/cmp_server.c @@ -48,7 +48,7 @@ void OSSL_CMP_SRV_CTX_free(OSSL_CMP_SRV_CTX *srv_ctx) OPENSSL_free(srv_ctx); } -OSSL_CMP_SRV_CTX *OSSL_CMP_SRV_CTX_new(OPENSSL_CTX *libctx, const char *propq) +OSSL_CMP_SRV_CTX *OSSL_CMP_SRV_CTX_new(OSSL_LIB_CTX *libctx, const char *propq) { OSSL_CMP_SRV_CTX *ctx = OPENSSL_zalloc(sizeof(OSSL_CMP_SRV_CTX)); diff --git a/crypto/cmp/cmp_util.c b/crypto/cmp/cmp_util.c index 2eb58da21c..9a2eecd998 100644 --- a/crypto/cmp/cmp_util.c +++ b/crypto/cmp/cmp_util.c @@ -217,7 +217,7 @@ int ossl_cmp_X509_STORE_add1_certs(X509_STORE *store, STACK_OF(X509) *certs, */ /* TODO this should be of more general interest and thus be exported. */ STACK_OF(X509) - *ossl_cmp_build_cert_chain(OPENSSL_CTX *libctx, const char *propq, + *ossl_cmp_build_cert_chain(OSSL_LIB_CTX *libctx, const char *propq, X509_STORE *store, STACK_OF(X509) *certs, X509 *cert) { |