* [PATCH ima-evm-utils] ima-evm-utils: Fix incorrect algorithm name in hash_info.gen
@ 2021-07-22 5:27 Tianjia Zhang
2021-07-22 12:28 ` Mimi Zohar
2021-07-22 13:10 ` Petr Vorel
0 siblings, 2 replies; 4+ messages in thread
From: Tianjia Zhang @ 2021-07-22 5:27 UTC (permalink / raw)
To: Mimi Zohar, Petr Vorel, Vitaly Chikunov, Stefan Berger,
linux-integrity, Jia Zhang, YiLin . Li
Cc: Tianjia Zhang
There is no such an algorithm name as sm3-256. This is an ambiguity
caused by the definition of the macro HASH_ALGO_SM3_256. The sed
command is only a special case of sm3, so sm3 is used to replace
the sm3-256 algorithm name.
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
src/.gitignore | 1 +
src/hash_info.gen | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/.gitignore b/src/.gitignore
index 38e8e3c..69d2988 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1 +1,2 @@
hash_info.h
+tmp_hash_info.h
diff --git a/src/hash_info.gen b/src/hash_info.gen
index 5f7a97f..f72db37 100755
--- a/src/hash_info.gen
+++ b/src/hash_info.gen
@@ -86,7 +86,7 @@ sed -n 's/HASH_ALGO_\(.*\),/\1 \L\1\E/p' $HASH_INFO | \
while read a b; do
# Normalize text hash name: if it contains underscore between
# digits replace it with a dash, other underscores are removed.
- b=$(echo "$b" | sed "s/\([0-9]\)_\([0-9]\)/\1-\2/g;s/_//g")
+ b=$(echo "$b" | sed "s/sm3_256/sm3/g;s/_//g")
printf '\t%-26s = "%s",\n' "[HASH_ALGO_$a]" "$b"
done
echo "};"
--
2.19.1.3.ge56e4f7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH ima-evm-utils] ima-evm-utils: Fix incorrect algorithm name in hash_info.gen
2021-07-22 5:27 [PATCH ima-evm-utils] ima-evm-utils: Fix incorrect algorithm name in hash_info.gen Tianjia Zhang
@ 2021-07-22 12:28 ` Mimi Zohar
2021-07-22 13:10 ` Petr Vorel
1 sibling, 0 replies; 4+ messages in thread
From: Mimi Zohar @ 2021-07-22 12:28 UTC (permalink / raw)
To: Tianjia Zhang, Petr Vorel, Vitaly Chikunov, Stefan Berger,
linux-integrity, Jia Zhang, YiLin . Li
Hi Tianjia,
On Thu, 2021-07-22 at 13:27 +0800, Tianjia Zhang wrote:
> There is no such an algorithm name as sm3-256. This is an ambiguity
> caused by the definition of the macro HASH_ALGO_SM3_256. The sed
> command is only a special case of sm3, so sm3 is used to replace
> the sm3-256 algorithm name.
>
> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> ---
> src/.gitignore | 1 +
> src/hash_info.gen | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/.gitignore b/src/.gitignore
> index 38e8e3c..69d2988 100644
> --- a/src/.gitignore
> +++ b/src/.gitignore
> @@ -1 +1,2 @@
> hash_info.h
> +tmp_hash_info.h
> diff --git a/src/hash_info.gen b/src/hash_info.gen
> index 5f7a97f..f72db37 100755
> --- a/src/hash_info.gen
> +++ b/src/hash_info.gen
> @@ -86,7 +86,7 @@ sed -n 's/HASH_ALGO_\(.*\),/\1 \L\1\E/p' $HASH_INFO | \
> while read a b; do
> # Normalize text hash name: if it contains underscore between
> # digits replace it with a dash, other underscores are removed.
> - b=$(echo "$b" | sed "s/\([0-9]\)_\([0-9]\)/\1-\2/g;s/_//g")
> + b=$(echo "$b" | sed "s/sm3_256/sm3/g;s/_//g")
Please update the comment associated with this change.
thanks,
Mimi
> printf '\t%-26s = "%s",\n' "[HASH_ALGO_$a]" "$b"
> done
> echo "};
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH ima-evm-utils] ima-evm-utils: Fix incorrect algorithm name in hash_info.gen
2021-07-22 5:27 [PATCH ima-evm-utils] ima-evm-utils: Fix incorrect algorithm name in hash_info.gen Tianjia Zhang
2021-07-22 12:28 ` Mimi Zohar
@ 2021-07-22 13:10 ` Petr Vorel
2021-07-23 6:36 ` Tianjia Zhang
1 sibling, 1 reply; 4+ messages in thread
From: Petr Vorel @ 2021-07-22 13:10 UTC (permalink / raw)
To: Tianjia Zhang
Cc: Mimi Zohar, Vitaly Chikunov, Stefan Berger, linux-integrity,
Jia Zhang, YiLin . Li
Hi Tianjia,
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Agree with Mimi to update the comment associated with this change.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH ima-evm-utils] ima-evm-utils: Fix incorrect algorithm name in hash_info.gen
2021-07-22 13:10 ` Petr Vorel
@ 2021-07-23 6:36 ` Tianjia Zhang
0 siblings, 0 replies; 4+ messages in thread
From: Tianjia Zhang @ 2021-07-23 6:36 UTC (permalink / raw)
To: Petr Vorel, Mimi Zohar
Cc: Vitaly Chikunov, Stefan Berger, linux-integrity, Jia Zhang, YiLin . Li
Hi Petr, Mimi,
On 7/22/21 9:10 PM, Petr Vorel wrote:
> Hi Tianjia,
>
> Reviewed-by: Petr Vorel <pvorel@suse.cz>
>
> Agree with Mimi to update the comment associated with this change.
>
> Kind regards,
> Petr
>
thanks, will update it soon.
Best regards,
Tianjia
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-23 6:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-22 5:27 [PATCH ima-evm-utils] ima-evm-utils: Fix incorrect algorithm name in hash_info.gen Tianjia Zhang
2021-07-22 12:28 ` Mimi Zohar
2021-07-22 13:10 ` Petr Vorel
2021-07-23 6:36 ` Tianjia Zhang
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).