From: Mimi Zohar <zohar@linux.ibm.com>
To: Vitaly Chikunov <vt@altlinux.org>,
Mimi Zohar <zohar@linux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
linux-integrity@vger.kernel.org
Subject: Re: [PATCH] ima-evm-utils: simplify digest alias handling
Date: Tue, 12 Feb 2019 11:23:40 -0500 [thread overview]
Message-ID: <1549988620.12743.272.camel@linux.ibm.com> (raw)
In-Reply-To: <20190212001400.11107-1-vt@altlinux.org>
Hi Vitaly,
Definitely a lot better.
> diff --git a/src/libimaevm.c b/src/libimaevm.c
> index d9ffa13..ed77211 100644
> --- a/src/libimaevm.c
> +++ b/src/libimaevm.c
> @@ -63,7 +63,7 @@
> #include "imaevm.h"
> #include "hash_info.h"
>
> -const char *const pkey_hash_algo[PKEY_HASH__LAST] = {
> +const char *pkey_hash_algo[PKEY_HASH__LAST] = {
Dropping the "const"?
> [PKEY_HASH_MD4] = "md4",
> [PKEY_HASH_MD5] = "md5",
> [PKEY_HASH_SHA1] = "sha1",
> @@ -72,8 +72,13 @@ const char *const pkey_hash_algo[PKEY_HASH__LAST] = {
> [PKEY_HASH_SHA384] = "sha384",
> [PKEY_HASH_SHA512] = "sha512",
> [PKEY_HASH_SHA224] = "sha224",
> - [PKEY_HASH_STREEBOG_256] = "md_gost12_256,streebog256",
> - [PKEY_HASH_STREEBOG_512] = "md_gost12_512,streebog512",
> + [PKEY_HASH_STREEBOG_256] = "md_gost12_256",
> + [PKEY_HASH_STREEBOG_512] = "md_gost12_512",
> +};
> +
> +const char *pkey_hash_algo_alias[PKEY_HASH__LAST] = {
> + [PKEY_HASH_STREEBOG_256] = "streebog256",
> + [PKEY_HASH_STREEBOG_512] = "streebog512",
> };
>
If the upstream kernel name is defined as "streebog", the alias would
be "gost".
> @@ -615,15 +553,14 @@ int get_hash_algo(const char *algo)
> /* first iterate over builtin algorithms */
> for (i = 0; i < PKEY_HASH__LAST; i++)
> if (pkey_hash_algo[i] &&
> - !strmatch(algo, pkey_hash_algo[i]))
> + !strcmp(algo, pkey_hash_algo[i]))
> return i;
>
> /* iterate over algorithms provided by kernel-headers */
> - for (i = 0; i < HASH_ALGO__LAST; i++) {
> - if (hash_algo_name[i] &&
> - !algocmp(algo, hash_algo_name[i]))
> + for (i = 0; i < PKEY_HASH__LAST; i++)
> + if (pkey_hash_algo_alias[i] &&
> + !strcmp(algo, pkey_hash_algo_alias[i]))
> return i;
> - }
>
This doesn't look right. The comments don't reflect the code.
Shouldn't there be 3 loops - pkey_hash_algo, pkey_hash_algo_alias, and
then the kernel header?
Mimi
next prev parent reply other threads:[~2019-02-12 16:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 0:14 [PATCH] ima-evm-utils: simplify digest alias handling Vitaly Chikunov
2019-02-12 16:23 ` Mimi Zohar [this message]
2019-02-12 17:23 ` Vitaly Chikunov
2019-02-12 19:17 ` Mimi Zohar
2019-02-12 19:31 ` Vitaly Chikunov
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=1549988620.12743.272.camel@linux.ibm.com \
--to=zohar@linux.ibm.com \
--cc=dmitry.kasatkin@gmail.com \
--cc=linux-integrity@vger.kernel.org \
--cc=vt@altlinux.org \
--cc=zohar@linux.vnet.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 NNTP newsgroup(s).