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 /test/testutil | |
| parent | 29000e43ea257bf54f6ccb2064b3744853b821b2 (diff) | |
| download | openssl-b425001010044adbdbcd98f8682694b30b73bbf4.zip openssl-b425001010044adbdbcd98f8682694b30b73bbf4.tar.gz openssl-b425001010044adbdbcd98f8682694b30b73bbf4.tar.bz2 | |
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 'test/testutil')
| -rw-r--r-- | test/testutil/provider.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/testutil/provider.c b/test/testutil/provider.c index f7c7b1c..c7ff44c 100644 --- a/test/testutil/provider.c +++ b/test/testutil/provider.c @@ -11,7 +11,7 @@ #include <openssl/provider.h> #include <string.h> -int test_get_libctx(OPENSSL_CTX **libctx, +int test_get_libctx(OSSL_LIB_CTX **libctx, OSSL_PROVIDER **default_null_provider, OSSL_PROVIDER **provider, int argn, const char *usage) { @@ -25,14 +25,14 @@ int test_get_libctx(OPENSSL_CTX **libctx, const char *config_fname = test_get_argument(argn + 1); *default_null_provider = OSSL_PROVIDER_load(NULL, "null"); - *libctx = OPENSSL_CTX_new(); + *libctx = OSSL_LIB_CTX_new(); if (!TEST_ptr(*libctx)) { TEST_error("Failed to create libctx\n"); goto err; } if (config_fname != NULL - && !TEST_true(OPENSSL_CTX_load_config(*libctx, config_fname))) { + && !TEST_true(OSSL_LIB_CTX_load_config(*libctx, config_fname))) { TEST_error("Error loading config file %s\n", config_fname); goto err; } |