From: Mimi Zohar <zohar@linux.ibm.com>
To: Jia Zhang <zhang.jia@linux.alibaba.com>, pvorel@suse.cz
Cc: linux-integrity@vger.kernel.org, ltp@lists.linux.it
Subject: Re: [PATCH 2/6] ima/ima_boot_aggregate: Don't hard code the length of sha1 hash
Date: Mon, 14 Jan 2019 15:33:26 -0500 [thread overview]
Message-ID: <1547498006.4156.199.camel@linux.ibm.com> (raw)
In-Reply-To: <1546827989-43569-3-git-send-email-zhang.jia@linux.alibaba.com>
On Mon, 2019-01-07 at 10:26 +0800, Jia Zhang wrote:
> Instead, use SHA_DIGEST_LENGTH.
>
> Signed-off-by: Jia Zhang <zhang.jia@linux.alibaba.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
> ---
> testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c b/testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c
> index d85d222..67be6a7 100644
> --- a/testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c
> +++ b/testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c
> @@ -42,7 +42,7 @@ static void display_sha1_digest(unsigned char *pcr)
> {
> int i;
>
> - for (i = 0; i < 20; i++)
> + for (i = 0; i < SHA_DIGEST_LENGTH; i++)
> printf("%02x", *(pcr + i) & 0xff);
> printf("\n");
> }
> @@ -94,8 +94,9 @@ int main(int argc, char *argv[])
> display_sha1_digest(event.header.digest);
> }
> SHA1_Init(&c);
> - SHA1_Update(&c, pcr[event.header.pcr].digest, 20);
> - SHA1_Update(&c, event.header.digest, 20);
> + SHA1_Update(&c, pcr[event.header.pcr].digest,
> + SHA_DIGEST_LENGTH);
> + SHA1_Update(&c, event.header.digest, SHA_DIGEST_LENGTH);
> SHA1_Final(pcr[event.header.pcr].digest, &c);
> #if MAX_EVENT_DATA_SIZE < USHRT_MAX
> if (event.header.len > MAX_EVENT_DATA_SIZE) {
> @@ -116,7 +117,7 @@ int main(int argc, char *argv[])
> printf("PCR-%2.2x: ", i);
> display_sha1_digest(pcr[i].digest);
> }
> - SHA1_Update(&c, pcr[i].digest, 20);
> + SHA1_Update(&c, pcr[i].digest, SHA_DIGEST_LENGTH);
> }
> SHA1_Final(boot_aggregate, &c);
>
next prev parent reply other threads:[~2019-01-14 20:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-07 2:26 [PATCH 0/6] LTP IMA fix bundle Jia Zhang
2019-01-07 2:26 ` [PATCH 1/6] ima/ima_boot_aggregate: Fix the definition of event log Jia Zhang
2019-01-07 2:26 ` [PATCH 2/6] ima/ima_boot_aggregate: Don't hard code the length of sha1 hash Jia Zhang
2019-01-14 20:33 ` Mimi Zohar [this message]
2019-01-07 2:26 ` [PATCH 3/6] ima/ima_boot_aggregate: Fix extending PCRs beyond PCR 0-7 Jia Zhang
2019-01-14 20:32 ` Mimi Zohar
2019-01-07 2:26 ` [PATCH 4/6] ima: Code cleanup Jia Zhang
2019-01-14 21:09 ` Mimi Zohar
2019-01-07 2:26 ` [PATCH 5/6] ima: Rename the folder name for policy files to datafiles Jia Zhang
2019-01-07 2:26 ` [PATCH 6/6] ima: Use ima tcb policy files for test Jia Zhang
2019-01-07 15:59 ` Jia Zhang
2019-01-14 19:32 ` Mimi Zohar
2019-01-15 1:12 ` Jia Zhang
2019-01-15 10:50 ` Petr Vorel
2019-01-13 12:14 ` [PATCH 0/6] LTP IMA fix bundle Jia Zhang
2019-01-15 2:14 [PATCH v2 " Jia Zhang
2019-01-15 2:14 ` [PATCH 2/6] ima/ima_boot_aggregate: Don't hard code the length of sha1 hash Jia Zhang
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=1547498006.4156.199.camel@linux.ibm.com \
--to=zohar@linux.ibm.com \
--cc=linux-integrity@vger.kernel.org \
--cc=ltp@lists.linux.it \
--cc=pvorel@suse.cz \
--cc=zhang.jia@linux.alibaba.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).