The branch master has been updated via b418980c3f5519c248afc40a575b89f629d56b45 (commit) via 64f849f439f5107c972c9dac9454d1284fd0ef48 (commit) from 738ee1819e3bb94723701fb505ce2971afe47a9b (commit)
- Log ----------------------------------------------------------------- commit b418980c3f5519c248afc40a575b89f629d56b45 Author: Dr. Matthias St. Pierre <matthias.st.pie...@ncp-e.com> Date: Thu Apr 16 19:10:14 2020 +0200 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 <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11542) commit 64f849f439f5107c972c9dac9454d1284fd0ef48 Author: Dr. Matthias St. Pierre <matthias.st.pie...@ncp-e.com> Date: Tue Apr 14 00:12:48 2020 +0200 Fix an assertion (and a comment) of evp_method_id() Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11542) ----------------------------------------------------------------------- Summary of changes: crypto/evp/evp_fetch.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c index e808bf818f..757b2dca7c 100644 --- a/crypto/evp/evp_fetch.c +++ b/crypto/evp/evp_fetch.c @@ -73,8 +73,8 @@ static OSSL_METHOD_STORE *get_evp_method_store(OPENSSL_CTX *libctx) } /* - * To identity the method in the EVP method store, we mix the name identity - * with the operation identity, with the assumption that we don't have more + * To identify the method in the EVP method store, we mix the name identity + * with the operation identity, under the assumption that we don't have more * than 2^24 names or more than 2^8 operation types. * * The resulting identity is a 32-bit integer, composed like this: @@ -83,10 +83,10 @@ 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 < (1 << 24) || operation_id < (1 << 8)) - || !ossl_assert(name_id > 0 && operation_id > 0)) + if (!ossl_assert(name_id > 0 && name_id < (1 << 24)) + || !ossl_assert(operation_id > 0 && operation_id < (1 << 8))) return 0; return ((name_id << 8) & 0xFFFFFF00) | (operation_id & 0x000000FF); } @@ -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); }