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 /engines | |
| 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 'engines')
| -rw-r--r-- | engines/e_loader_attic.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c index 97789f7293..72ceb38a33 100644 --- a/engines/e_loader_attic.c +++ b/engines/e_loader_attic.c @@ -262,7 +262,7 @@ typedef OSSL_STORE_INFO *(*file_try_decode_fn)(const char *pem_name, int *matchcount, const UI_METHOD *ui_method, void *ui_data, const char *uri, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq); /* * The eof function should return 1 if there's no more data to be found @@ -299,7 +299,7 @@ static OSSL_STORE_INFO *try_decode_PKCS12(const char *pem_name, int *matchcount, const UI_METHOD *ui_method, void *ui_data, const char *uri, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq) { OSSL_STORE_INFO *store_info = NULL; @@ -434,7 +434,7 @@ static OSSL_STORE_INFO *try_decode_PKCS8Encrypted(const char *pem_name, const UI_METHOD *ui_method, void *ui_data, const char *uri, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq) { X509_SIG *p8 = NULL; @@ -509,7 +509,7 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name, int *matchcount, const UI_METHOD *ui_method, void *ui_data, const char *uri, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq) { OSSL_STORE_INFO *store_info = NULL; @@ -638,7 +638,7 @@ static OSSL_STORE_INFO *try_decode_PUBKEY(const char *pem_name, int *matchcount, const UI_METHOD *ui_method, void *ui_data, const char *uri, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq) { OSSL_STORE_INFO *store_info = NULL; @@ -674,7 +674,7 @@ static OSSL_STORE_INFO *try_decode_params(const char *pem_name, int *matchcount, const UI_METHOD *ui_method, void *ui_data, const char *uri, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq) { OSSL_STORE_INFO *store_info = NULL; @@ -752,7 +752,7 @@ static OSSL_STORE_INFO *try_decode_X509Certificate(const char *pem_name, const UI_METHOD *ui_method, void *ui_data, const char *uri, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq) { OSSL_STORE_INFO *store_info = NULL; @@ -808,7 +808,7 @@ static OSSL_STORE_INFO *try_decode_X509CRL(const char *pem_name, int *matchcount, const UI_METHOD *ui_method, void *ui_data, const char *uri, - OPENSSL_CTX *libctx, + OSSL_LIB_CTX *libctx, const char *propq) { OSSL_STORE_INFO *store_info = NULL; @@ -902,7 +902,7 @@ struct ossl_store_loader_ctx_st { /* Expected object type. May be unspecified */ int expected_type; - OPENSSL_CTX *libctx; + OSSL_LIB_CTX *libctx; char *propq; }; @@ -942,7 +942,7 @@ static int file_find_type(OSSL_STORE_LOADER_CTX *ctx) static OSSL_STORE_LOADER_CTX *file_open_ex (const OSSL_STORE_LOADER *loader, const char *uri, - OPENSSL_CTX *libctx, const char *propq, + OSSL_LIB_CTX *libctx, const char *propq, const UI_METHOD *ui_method, void *ui_data) { OSSL_STORE_LOADER_CTX *ctx = NULL; @@ -1074,7 +1074,7 @@ static OSSL_STORE_LOADER_CTX *file_open static OSSL_STORE_LOADER_CTX *file_attach (const OSSL_STORE_LOADER *loader, BIO *bp, - OPENSSL_CTX *libctx, const char *propq, + OSSL_LIB_CTX *libctx, const char *propq, const UI_METHOD *ui_method, void *ui_data) { OSSL_STORE_LOADER_CTX *ctx = NULL; |