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 /include/internal/property.h | |
| 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 'include/internal/property.h')
| -rw-r--r-- | include/internal/property.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/internal/property.h b/include/internal/property.h index cd3982549d..f2682a1fed 100644 --- a/include/internal/property.h +++ b/include/internal/property.h @@ -17,23 +17,23 @@ typedef struct ossl_method_store_st OSSL_METHOD_STORE; typedef struct ossl_property_list_st OSSL_PROPERTY_LIST; /* Initialisation */ -int ossl_property_parse_init(OPENSSL_CTX *ctx); +int ossl_property_parse_init(OSSL_LIB_CTX *ctx); /* Property definition parser */ -OSSL_PROPERTY_LIST *ossl_parse_property(OPENSSL_CTX *ctx, const char *defn); +OSSL_PROPERTY_LIST *ossl_parse_property(OSSL_LIB_CTX *ctx, const char *defn); /* Property query parser */ -OSSL_PROPERTY_LIST *ossl_parse_query(OPENSSL_CTX *ctx, const char *s); +OSSL_PROPERTY_LIST *ossl_parse_query(OSSL_LIB_CTX *ctx, const char *s); /* Property checker of query vs definition */ int ossl_property_match_count(const OSSL_PROPERTY_LIST *query, const OSSL_PROPERTY_LIST *defn); -int ossl_property_is_enabled(OPENSSL_CTX *ctx, const char *property_name, +int ossl_property_is_enabled(OSSL_LIB_CTX *ctx, const char *property_name, const OSSL_PROPERTY_LIST *prop_list); /* Free a parsed property list */ void ossl_property_free(OSSL_PROPERTY_LIST *p); /* Implementation store functions */ -OSSL_METHOD_STORE *ossl_method_store_new(OPENSSL_CTX *ctx); +OSSL_METHOD_STORE *ossl_method_store_new(OSSL_LIB_CTX *ctx); void ossl_method_store_free(OSSL_METHOD_STORE *store); int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov, int nid, const char *properties, void *method, @@ -45,7 +45,8 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store, int nid, const char *prop_query, void **method); /* Get the global properties associate with the specified library context */ -OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OPENSSL_CTX *ctx, int loadconfig); +OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OSSL_LIB_CTX *ctx, + int loadconfig); /* property query cache functions */ int ossl_method_store_cache_get(OSSL_METHOD_STORE *store, int nid, |