diff options
author | Richard Levitte <levitte@openssl.org> | 2021-06-10 07:25:56 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2021-06-11 09:09:21 +0200 |
commit | 6309b799e940d57fdeb55ba4416a571283beb116 (patch) | |
tree | b385d12eeb465d07df1a9d46282f1a51e52945a3 /crypto | |
parent | b19fcc66d382357617744690dc3363947de2cb6f (diff) |
STORE: Make OSSL_STORE_LOADER_fetch() consistent with all other fetch functions
The argument order was different on this one.
Fixes #15688
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15689)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/store/store_lib.c | 4 | ||||
-rw-r--r-- | crypto/store/store_meth.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c index f7939ea0dd..c0d9dafbdf 100644 --- a/crypto/store/store_lib.c +++ b/crypto/store/store_lib.c @@ -122,7 +122,7 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq, #endif if (loader == NULL && (fetched_loader = - OSSL_STORE_LOADER_fetch(schemes[i], libctx, propq)) != NULL) { + OSSL_STORE_LOADER_fetch(libctx, schemes[i], propq)) != NULL) { const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_get0_provider(fetched_loader); void *provctx = OSSL_PROVIDER_get0_provider_ctx(provider); @@ -975,7 +975,7 @@ OSSL_STORE_CTX *OSSL_STORE_attach(BIO *bp, const char *scheme, #endif if (loader == NULL && (fetched_loader = - OSSL_STORE_LOADER_fetch(scheme, libctx, propq)) != NULL) { + OSSL_STORE_LOADER_fetch(libctx, scheme, propq)) != NULL) { const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_get0_provider(fetched_loader); void *provctx = OSSL_PROVIDER_get0_provider_ctx(provider); diff --git a/crypto/store/store_meth.c b/crypto/store/store_meth.c index cf2d1c6bba..a48e40d8c8 100644 --- a/crypto/store/store_meth.c +++ b/crypto/store/store_meth.c @@ -251,7 +251,7 @@ static void *construct_loader(const OSSL_ALGORITHM *algodef, /* * Flag to indicate that there was actual construction errors. This - * helps inner_evp_generic_fetch() determine what error it should + * helps inner_loader_fetch() determine what error it should * record on inaccessible algorithms. */ if (method == NULL) @@ -355,8 +355,8 @@ static OSSL_STORE_LOADER *inner_loader_fetch(OSSL_LIB_CTX *libctx, return method; } -OSSL_STORE_LOADER *OSSL_STORE_LOADER_fetch(const char *scheme, - OSSL_LIB_CTX *libctx, +OSSL_STORE_LOADER *OSSL_STORE_LOADER_fetch(OSSL_LIB_CTX *libctx, + const char *scheme, const char *properties) { return inner_loader_fetch(libctx, 0, scheme, properties); |