public inbox for linux-integrity@vger.kernel.org
 help / color / mirror / Atom feed
From: Bruno Meneguele <bmeneg@redhat.com>
To: Mimi Zohar <zohar@linux.ibm.com>
Cc: linux-integrity@vger.kernel.org, Petr Vorel <pvorel@suse.cz>,
	Vitaly Chikunov <vt@altlinux.org>
Subject: Re: [PATCH 6/6] ima-evm-utils: define a basic hash_info.h file
Date: Wed, 15 Jul 2020 14:58:29 -0300	[thread overview]
Message-ID: <20200715175829.GG3720@glitch> (raw)
In-Reply-To: <1594088791-27370-7-git-send-email-zohar@linux.ibm.com>

[-- Attachment #1: Type: text/plain, Size: 2507 bytes --]

Hi Mimi,

On Mon, Jul 06, 2020 at 10:26:31PM -0400, Mimi Zohar wrote:
> Some older system kernel header packages don't necessarily include
> hash_info.h.
> 
> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
> ---
>  src/Makefile.am   |  2 +-
>  src/hash_info.gen | 43 +++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 44 insertions(+), 1 deletion(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 36652427a8ec..9bbff5034ef4 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -34,5 +34,5 @@ endif
>  
>  AM_CPPFLAGS = -I$(top_srcdir) -include config.h
>  
> -CLEANFILES = hash_info.h
> +CLEANFILES = hash_info.h tmp_hash_info.h
>  DISTCLEANFILES = @DISTCLEANFILES@
> diff --git a/src/hash_info.gen b/src/hash_info.gen
> index 54532ca5b847..5f7a97fb3117 100755
> --- a/src/hash_info.gen
> +++ b/src/hash_info.gen
> @@ -18,11 +18,54 @@ KERNEL_HEADERS=$1
>  HASH_INFO_H=uapi/linux/hash_info.h
>  HASH_INFO=$KERNEL_HEADERS/include/$HASH_INFO_H
>  
> +TMPHASHINFO="./tmp_hash_info.h"
> +gen_hashinfo() {
> +cat << __EOF__ >$TMPHASHINFO
> +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
> +/*
> + * Hash Info: Hash algorithms information
> + *
> + * Copyright (c) 2013 Dmitry Kasatkin <d.kasatkin@samsung.com>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the Free
> + * Software Foundation; either version 2 of the License, or (at your option)
> + * any later version.
> + *
> + */
> +
> +enum hash_algo {
> +	HASH_ALGO_MD4,
> +	HASH_ALGO_MD5,
> +	HASH_ALGO_SHA1,
> +	HASH_ALGO_RIPE_MD_160,
> +	HASH_ALGO_SHA256,
> +	HASH_ALGO_SHA384,
> +	HASH_ALGO_SHA512,
> +	HASH_ALGO_SHA224,
> +	HASH_ALGO_RIPE_MD_128,
> +	HASH_ALGO_RIPE_MD_256,
> +	HASH_ALGO_RIPE_MD_320,
> +	HASH_ALGO_WP_256,
> +	HASH_ALGO_WP_384,
> +	HASH_ALGO_WP_512,
> +	HASH_ALGO_TGR_128,
> +	HASH_ALGO_TGR_160,
> +	HASH_ALGO_TGR_192,
> +	HASH_ALGO_SM3_256,
> +	HASH_ALGO__LAST
> +};
> +__EOF__

Just a minor point on HASH_ALGO_SM3_256:

The old kernels that didn't export hash_info.h uapi didn't support
HASH_ALGO_SM3_256 as well. Wouldn't it be better to also not include it
in the tmp_hash_info considering it'll be used only by those running
older kernels without SM3 support?

Keeping it won't cause any issues though. So I'm fine with it either
way.

-- 
bmeneg 
PGP Key: http://bmeneg.com/pubkey.txt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2020-07-15 17:58 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-07  2:26 [PATCH 0/6] ima-evm-utils: miscellanous code clean up and bug fixes Mimi Zohar
2020-07-07  2:26 ` [PATCH 1/6] ima-evm-utils: fix PCRAggr error message Mimi Zohar
2020-07-07  2:26 ` [PATCH 2/6] ima-evm-utils: fix measurement violation checking Mimi Zohar
2020-07-07  2:26 ` [PATCH 3/6] ima-evm-utils: don't hardcode validating the IMA measurement list Mimi Zohar
2020-07-07  2:26 ` [PATCH 4/6] ima-evm-utils: calculate and verify the template data digest Mimi Zohar
2020-07-07  2:26 ` [PATCH 5/6] ima-evm-utils: use uint32_t for template length Mimi Zohar
2020-07-07  2:26 ` [PATCH 6/6] ima-evm-utils: define a basic hash_info.h file Mimi Zohar
2020-07-15 17:58   ` Bruno Meneguele [this message]
2020-07-15 19:28     ` Mimi Zohar
2020-07-15 20:18       ` Bruno Meneguele

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=20200715175829.GG3720@glitch \
    --to=bmeneg@redhat.com \
    --cc=linux-integrity@vger.kernel.org \
    --cc=pvorel@suse.cz \
    --cc=vt@altlinux.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