From: Stefan Berger <stefanb@linux.ibm.com>
To: Mimi Zohar <zohar@linux.ibm.com>, linux-integrity@vger.kernel.org
Subject: Re: [ima-evm-utils PATCH v3 04/13] Update imaevm_verify_hash() definition to include "hash_algo" parameter
Date: Tue, 9 Jan 2024 11:34:20 -0500 [thread overview]
Message-ID: <d3b43368-6c5f-4e81-8e01-e95735bb26e6@linux.ibm.com> (raw)
In-Reply-To: <20240104190558.3674008-5-zohar@linux.ibm.com>
On 1/4/24 14:05, Mimi Zohar wrote:
> Instead of relying on a global static "hash_algo" variable, which is not
> concurrency-safe, update the imaevm_verify_hash() function definition
> and callers to include a "hash_algo" parameter as a place holder.
>
> Now with the "hash_algo" parameter, export the imaevm_verify_hash()
> definition.
>
> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
> ---
> src/imaevm.h | 3 +++
> src/libimaevm.c | 15 ++++++++-------
> 2 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/src/imaevm.h b/src/imaevm.h
> index 4fd421f5cd1d..0b86d28944b3 100644
> --- a/src/imaevm.h
> +++ b/src/imaevm.h
> @@ -261,6 +261,9 @@ IMAEVM_DEPRECATED int ima_verify_signature(const char *file, unsigned char *sig,
> int digestlen);
> IMAEVM_DEPRECATED void init_public_keys(const char *keyfiles);
>
> +int imaevm_verify_hash(struct public_key_entry *public_keys, const char *file,
> + const char *hash_algo, const unsigned char *hash,
> + int size, unsigned char *sig, int siglen);
> int ima_verify_signature2(struct public_key_entry *public_keys, const char *file,
> unsigned char *sig, int siglen,
> unsigned char *digest, int digestlen);
> diff --git a/src/libimaevm.c b/src/libimaevm.c
> index 9cc83e071610..a5e9fd5080ac 100644
> --- a/src/libimaevm.c
> +++ b/src/libimaevm.c
> @@ -729,9 +729,9 @@ int imaevm_hash_algo_from_sig(unsigned char *sig)
> return -1;
> }
>
> -int imaevm_verify_hash(void *public_keys, const char *file,
> - const unsigned char *hash, int size,
> - unsigned char *sig, int siglen)
> +int imaevm_verify_hash(struct public_key_entry *public_keys, const char *file,
> + const char *hash_algo, const unsigned char *hash,
> + int size, unsigned char *sig, int siglen)
With patch 3 fixed, this will disappear.
> {
> /* Get signature type from sig header */
> if (sig[1] == DIGSIG_VERSION_1) {
> @@ -762,7 +762,8 @@ int imaevm_verify_hash(void *public_keys, const char *file,
> int verify_hash(const char *file, const unsigned char *hash, int size,
> unsigned char *sig, int siglen)
> {
> - return imaevm_verify_hash(g_public_keys, file, hash, size, sig, siglen);
> + return imaevm_verify_hash(g_public_keys, file, NULL, hash, size,
> + sig, siglen);
> }
>
> int ima_verify_signature2(struct public_key_entry *public_keys, const char *file,
> @@ -795,15 +796,15 @@ int ima_verify_signature2(struct public_key_entry *public_keys, const char *file
> * measurement list, not by calculating the local file digest.
> */
> if (digest && digestlen > 0)
> - return imaevm_verify_hash(public_keys, file, digest, digestlen,
> - sig, siglen);
> + return imaevm_verify_hash(public_keys, file, NULL, digest,
> + digestlen, sig, siglen);
>
> hashlen = ima_calc_hash(file, hash);
> if (hashlen <= 1)
> return hashlen;
> assert(hashlen <= sizeof(hash));
>
> - return imaevm_verify_hash(public_keys, file, hash, hashlen,
> + return imaevm_verify_hash(public_keys, file, NULL, hash, hashlen,
> sig, siglen);
> }
>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
next prev parent reply other threads:[~2024-01-09 16:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-04 19:05 [ima-evm-utils PATCH v3 00/13] Address non concurrency-safe libimaevm global variables Mimi Zohar
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 01/13] Rename "public_keys" to "g_public_keys" Mimi Zohar
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 02/13] Free public keys list Mimi Zohar
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 03/13] Update library function definitions to include a "public_keys" parameter Mimi Zohar
2024-01-09 16:18 ` Stefan Berger
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 04/13] Update imaevm_verify_hash() definition to include "hash_algo" parameter Mimi Zohar
2024-01-09 16:34 ` Stefan Berger [this message]
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 05/13] Update cmd_verify_ima() to define and use a local list of public keys Mimi Zohar
2024-01-09 16:37 ` Stefan Berger
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 06/13] Update cmd_verify_evm " Mimi Zohar
2024-01-09 17:00 ` Stefan Berger
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 07/13] Update ima_measurements " Mimi Zohar
2024-01-09 17:07 ` Stefan Berger
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 08/13] Define library ima_calc_hash2() function with a hash algorithm parameter Mimi Zohar
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 09/13] Use a local hash algorithm variable when verifying file signatures Mimi Zohar
2024-01-09 17:21 ` Stefan Berger
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 10/13] Update EVM signature verification to use a local hash algorithm variable Mimi Zohar
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 11/13] Use a file specific hash algorithm variable for signing files Mimi Zohar
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 12/13] Update sign_hash_v*() definition to include the key password Mimi Zohar
2024-01-04 19:05 ` [ima-evm-utils PATCH v3 13/13] Define and use a file specific "keypass" variable Mimi Zohar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d3b43368-6c5f-4e81-8e01-e95735bb26e6@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=linux-integrity@vger.kernel.org \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).