From b418980c3f5519c248afc40a575b89f629d56b45 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Thu, 16 Apr 2020 19:10:14 +0200 Subject: Swap parameters of evp_method_id() The order of the function's parameters `name_id` and `operation_id` was reverted compared to their order of appearance in the comments and assertions. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/11542) --- crypto/evp/evp_fetch.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crypto') diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c index 954ddb685c..757b2dca7c 100644 --- a/crypto/evp/evp_fetch.c +++ b/crypto/evp/evp_fetch.c @@ -83,7 +83,7 @@ static OSSL_METHOD_STORE *get_evp_method_store(OPENSSL_CTX *libctx) * | name identity | op id | * +------------------------+--------+ */ -static uint32_t evp_method_id(unsigned int operation_id, int name_id) +static uint32_t evp_method_id(int name_id, unsigned int operation_id) { if (!ossl_assert(name_id > 0 && name_id < (1 << 24)) || !ossl_assert(operation_id > 0 && operation_id < (1 << 8))) @@ -116,7 +116,7 @@ static void *get_evp_method_from_store(OPENSSL_CTX *libctx, void *store, } if (name_id == 0 - || (meth_id = evp_method_id(methdata->operation_id, name_id)) == 0) + || (meth_id = evp_method_id(name_id, methdata->operation_id)) == 0) return NULL; if (store == NULL @@ -154,7 +154,7 @@ static int put_evp_method_in_store(OPENSSL_CTX *libctx, void *store, if ((namemap = ossl_namemap_stored(libctx)) == NULL || (name_id = ossl_namemap_name2num_n(namemap, names, l)) == 0 - || (meth_id = evp_method_id(operation_id, name_id)) == 0) + || (meth_id = evp_method_id(name_id, operation_id)) == 0) return 0; if (store == NULL @@ -242,7 +242,7 @@ inner_evp_generic_fetch(OPENSSL_CTX *libctx, int operation_id, * about 2^8) or too many names (more than about 2^24). In that case, * we can't create any new method. */ - if (name_id != 0 && (meth_id = evp_method_id(operation_id, name_id)) == 0) + if (name_id != 0 && (meth_id = evp_method_id(name_id, operation_id)) == 0) return NULL; if (meth_id == 0 @@ -277,7 +277,7 @@ inner_evp_generic_fetch(OPENSSL_CTX *libctx, int operation_id, */ if (name_id == 0) name_id = ossl_namemap_name2num(namemap, name); - meth_id = evp_method_id(operation_id, name_id); + meth_id = evp_method_id(name_id, operation_id); ossl_method_store_cache_set(store, meth_id, properties, method, up_ref_method, free_method); } -- cgit v1.2.3