diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-24 10:42:23 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-01 09:25:20 +0100 |
| commit | d8652be06e2778e8898453a391deb7253e1a35a2 (patch) | |
| tree | fe40e22edb39642aa7ae633320c1900388f2e7ee /engines | |
| parent | aedac96c1172ca9a9efe72e027e935504b599e2f (diff) | |
Run the withlibctx.pl script
Automatically rename all instances of _with_libctx() to _ex() as per
our coding style.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12970)
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_loader_attic.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c index 47afe3f790..1bb2002d52 100644 --- a/engines/e_loader_attic.c +++ b/engines/e_loader_attic.c @@ -523,7 +523,7 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name, *matchcount = 1; if (p8inf != NULL) - pkey = EVP_PKCS82PKEY_with_libctx(p8inf, libctx, propq); + pkey = EVP_PKCS82PKEY_ex(p8inf, libctx, propq); PKCS8_PRIV_KEY_INFO_free(p8inf); } else { int slen; @@ -777,7 +777,7 @@ static OSSL_STORE_INFO *try_decode_X509Certificate(const char *pem_name, *matchcount = 1; } - cert = X509_new_with_libctx(libctx, propq); + cert = X509_new_ex(libctx, propq); if (cert == NULL) return NULL; @@ -940,7 +940,7 @@ static int file_find_type(OSSL_STORE_LOADER_CTX *ctx) return 1; } -static OSSL_STORE_LOADER_CTX *file_open_with_libctx +static OSSL_STORE_LOADER_CTX *file_open_ex (const OSSL_STORE_LOADER *loader, const char *uri, OPENSSL_CTX *libctx, const char *propq, const UI_METHOD *ui_method, void *ui_data) @@ -1069,7 +1069,7 @@ static OSSL_STORE_LOADER_CTX *file_open (const OSSL_STORE_LOADER *loader, const char *uri, const UI_METHOD *ui_method, void *ui_data) { - return file_open_with_libctx(loader, uri, NULL, NULL, ui_method, ui_data); + return file_open_ex(loader, uri, NULL, NULL, ui_method, ui_data); } static OSSL_STORE_LOADER_CTX *file_attach @@ -1744,8 +1744,7 @@ static int bind_loader_attic(ENGINE *e) if (/* Create the OSSL_STORE_LOADER */ (loader_attic = OSSL_STORE_LOADER_new(e, "file")) == NULL - || !OSSL_STORE_LOADER_set_open_with_libctx(loader_attic, - file_open_with_libctx) + || !OSSL_STORE_LOADER_set_open_ex(loader_attic, file_open_with_libctx) || !OSSL_STORE_LOADER_set_open(loader_attic, file_open) || !OSSL_STORE_LOADER_set_attach(loader_attic, file_attach) || !OSSL_STORE_LOADER_set_ctrl(loader_attic, file_ctrl) |