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/self_test_core.c | |
| parent | 29000e43ea257bf54f6ccb2064b3744853b821b2 (diff) | |
| download | openssl-new-b425001010044adbdbcd98f8682694b30b73bbf4.tar.gz | |
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/self_test_core.c')
| -rw-r--r-- | crypto/self_test_core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/self_test_core.c b/crypto/self_test_core.c index 7aa8490ddf..a4f6c9ab2a 100644 --- a/crypto/self_test_core.c +++ b/crypto/self_test_core.c @@ -32,7 +32,7 @@ struct ossl_self_test_st }; #ifndef FIPS_MODULE -static void *self_test_set_callback_new(OPENSSL_CTX *ctx) +static void *self_test_set_callback_new(OSSL_LIB_CTX *ctx) { SELF_TEST_CB *stcb; @@ -45,18 +45,18 @@ static void self_test_set_callback_free(void *stcb) OPENSSL_free(stcb); } -static const OPENSSL_CTX_METHOD self_test_set_callback_method = { +static const OSSL_LIB_CTX_METHOD self_test_set_callback_method = { self_test_set_callback_new, self_test_set_callback_free, }; -static SELF_TEST_CB *get_self_test_callback(OPENSSL_CTX *libctx) +static SELF_TEST_CB *get_self_test_callback(OSSL_LIB_CTX *libctx) { - return openssl_ctx_get_data(libctx, OPENSSL_CTX_SELF_TEST_CB_INDEX, - &self_test_set_callback_method); + return ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_SELF_TEST_CB_INDEX, + &self_test_set_callback_method); } -void OSSL_SELF_TEST_set_callback(OPENSSL_CTX *libctx, OSSL_CALLBACK *cb, +void OSSL_SELF_TEST_set_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK *cb, void *cbarg) { SELF_TEST_CB *stcb = get_self_test_callback(libctx); @@ -67,7 +67,7 @@ void OSSL_SELF_TEST_set_callback(OPENSSL_CTX *libctx, OSSL_CALLBACK *cb, } } -void OSSL_SELF_TEST_get_callback(OPENSSL_CTX *libctx, OSSL_CALLBACK **cb, +void OSSL_SELF_TEST_get_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK **cb, void **cbarg) { SELF_TEST_CB *stcb = get_self_test_callback(libctx); |