The branch master has been updated
via 6309b799e940d57fdeb55ba4416a571283beb116 (commit)
from b19fcc66d382357617744690dc3363947de2cb6f (commit)
- Log -----------------------------------------------------------------
commit 6309b799e940d57fdeb55ba4416a571283beb116
Author: Richard Levitte <levi...@openssl.org>
Date: Thu Jun 10 07:25:56 2021 +0200
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 <m...@openssl.org>
Reviewed-by: Paul Dale <pa...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15689)
-----------------------------------------------------------------------
Summary of changes:
crypto/store/store_lib.c | 4 ++--
crypto/store/store_meth.c | 6 +++---
doc/man3/OSSL_STORE_LOADER.pod | 6 +++---
include/openssl/store.h | 4 ++--
4 files changed, 10 insertions(+), 10 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);
diff --git a/doc/man3/OSSL_STORE_LOADER.pod b/doc/man3/OSSL_STORE_LOADER.pod
index 04fd318897..d150d24b49 100644
--- a/doc/man3/OSSL_STORE_LOADER.pod
+++ b/doc/man3/OSSL_STORE_LOADER.pod
@@ -33,8 +33,8 @@ unregister STORE loaders for different URI schemes
typedef struct ossl_store_loader_st OSSL_STORE_LOADER;
- 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);
int OSSL_STORE_LOADER_up_ref(OSSL_STORE_LOADER *loader);
void OSSL_STORE_LOADER_free(OSSL_STORE_LOADER *loader);
@@ -119,7 +119,7 @@ storage schemes.
OSSL_STORE_LOADER_fetch() looks for an implementation for a storage
I<scheme> within the providers that has been loaded into the B<OSSL_LIB_CTX>
-given by I<ctx>, and with the properties given by I<properties>.
+given by I<libctx>, and with the properties given by I<properties>.
OSSL_STORE_LOADER_up_ref() increments the reference count for the given
I<loader>.
diff --git a/include/openssl/store.h b/include/openssl/store.h
index c3e9beeff6..3c1445e0e6 100644
--- a/include/openssl/store.h
+++ b/include/openssl/store.h
@@ -253,8 +253,8 @@ int OSSL_STORE_find(OSSL_STORE_CTX *ctx, const
OSSL_STORE_SEARCH *search);
typedef struct ossl_store_loader_st OSSL_STORE_LOADER;
-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);
int OSSL_STORE_LOADER_up_ref(OSSL_STORE_LOADER *loader);
void OSSL_STORE_LOADER_free(OSSL_STORE_LOADER *loader);
