* [PATCH v3 ima-evm-utils 1/2] set default hash algorithm in configuration time
2021-08-20 22:49 [PATCH v3 ima-evm-utils 0/2] make default hash algorithm dynamic Bruno Meneguele
@ 2021-08-20 22:49 ` Bruno Meneguele
2021-08-20 22:55 ` Bruno Meneguele
2021-08-20 22:49 ` [PATCH v3 ima-evm-utils 2/2] make SHA-256 the default hash algorithm Bruno Meneguele
1 sibling, 1 reply; 4+ messages in thread
From: Bruno Meneguele @ 2021-08-20 22:49 UTC (permalink / raw)
To: zohar, Simon.THOBY, kgold; +Cc: linux-integrity, Bruno Meneguele
The default hash algorithm for evmctl is today hardcoded at libimaevm.c
file. To facilitate different distributions and users to set their own
default hash algorithm this patch adds the --with-default-hash=<algo> option
to the configuration script.
The algorithm chosen by the user will then be checked if is available in the
kernel, otherwise IMA won't be able to verify files hashed by the user. For
that, the file exposed by the kernel crypto API (/proc/crypto) is filtered
by an AWK script in order to check the algorithm's name and the module
providing it. Initally, only "module: kernel" is accepted, following IMA's
CONFIG_CRYPTO_SHA1/SHA256 dependency.
Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
---
README | 2 +-
configure.ac | 1 +
m4/default-hash-algo.m4 | 48 +++++++++++++++++++++++++++++++++++++++++
src/evmctl.c | 4 ++--
src/imaevm.h | 4 ++++
src/libimaevm.c | 2 +-
6 files changed, 57 insertions(+), 4 deletions(-)
create mode 100644 m4/default-hash-algo.m4
diff --git a/README b/README
index 87cd3b5cd7da..4e35826cd982 100644
--- a/README
+++ b/README
@@ -41,7 +41,7 @@ COMMANDS
OPTIONS
-------
- -a, --hashalgo sha1 (default), sha224, sha256, sha384, sha512
+ -a, --hashalgo sha1, sha224, sha256, sha384, sha512
-s, --imasig make IMA signature
-d, --imahash make IMA hash
-f, --sigfile store IMA signature in .sig file instead of xattr
diff --git a/configure.ac b/configure.ac
index a2d91b3db202..1c45f7f757ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,7 @@ else
fi
EVMCTL_MANPAGE_DOCBOOK_XSL
+AX_DEFAULT_HASH_ALGO
# for gcov
#CFLAGS="$CFLAGS -Wall -fprofile-arcs -ftest-coverage"
diff --git a/m4/default-hash-algo.m4 b/m4/default-hash-algo.m4
new file mode 100644
index 000000000000..14be44731ba6
--- /dev/null
+++ b/m4/default-hash-algo.m4
@@ -0,0 +1,48 @@
+dnl Copyright (c) 2021 Bruno Meneguele <bmeneg@redhat.com>
+dnl Check hash algorithm availability in the kernel
+dnl
+dnl $1 = hash algorithm passed through --with-default-hash=<algo>
+
+AC_DEFUN([AX_DEFAULT_HASH_ALGO], [
+ CRYPTO_FILE="/proc/crypto"
+
+ AC_ARG_WITH([default_hash],
+ AS_HELP_STRING([--with-default-hash=ALGORITHM], [specifies the default hash algorithm to be used]),
+ [HASH_ALGO=$withval],
+ [HASH_ALGO=sha1])
+
+ AC_CHECK_FILE([$CRYPTO_FILE],
+ [HAVE_CRYPTO_FILE=yes],
+ [AC_MSG_WARN([$CRYPTO_FILE file not found.])])
+
+ if test "x$HAVE_CRYPTO_FILE" = "x"; then
+ AC_MSG_RESULT([using $HASH_ALGO algorithm as default hash algorith])
+ AC_DEFINE_UNQUOTED(DEFAULT_HASH_ALGO, "$HASH_ALGO", [Define default hash algorithm])
+ else
+ awk_script=$(cat <<-'EOF'
+ /^$/ { have_name = 0 }
+ /^name.*/ {
+ if ($3 == hashalgo) {
+ have_name = 1
+ }
+ }
+ /^module.*/ {
+ if (have_name && $3 == "kernel") {
+ exit 1
+ }
+ }
+ EOF
+ )
+
+ AC_PROG_AWK()
+ $AWK -v hashalgo=$HASH_ALGO '$awk_script' $CRYPTO_FILE &>/dev/null
+ have_hash=$?
+
+ if test "x$have_hash" = "x"; then
+ AC_MSG_ERROR([$HASH_ALGO algorithm specified, but not provided by the kernel], 1)
+ else
+ AC_MSG_NOTICE([using $HASH_ALGO as default hash algorithm])
+ AC_DEFINE_UNQUOTED(DEFAULT_HASH_ALGO, "$HASH_ALGO", [Define default hash algorithm])
+ fi
+ fi
+])
diff --git a/src/evmctl.c b/src/evmctl.c
index c999589943aa..d9385a225e88 100644
--- a/src/evmctl.c
+++ b/src/evmctl.c
@@ -2500,7 +2500,7 @@ static void usage(void)
printf(
"\n"
- " -a, --hashalgo sha1 (default), sha224, sha256, sha384, sha512, streebog256, streebog512\n"
+ " -a, --hashalgo sha1, sha224, sha256, sha384, sha512, streebog256, streebog512 (default: %s)\n"
" -s, --imasig make IMA signature\n"
" -d, --imahash make IMA hash\n"
" -f, --sigfile store IMA signature in .sig file instead of xattr\n"
@@ -2534,7 +2534,7 @@ static void usage(void)
" --ignore-violations ignore ToMToU measurement violations\n"
" -v increase verbosity level\n"
" -h, --help display this help and exit\n"
- "\n");
+ "\n", DEFAULT_HASH_ALGO);
}
struct command cmds[] = {
diff --git a/src/imaevm.h b/src/imaevm.h
index 491f136c105f..cc3dfd2e9163 100644
--- a/src/imaevm.h
+++ b/src/imaevm.h
@@ -74,6 +74,10 @@
#define log_err(fmt, args...) do_log(LOG_ERR, fmt, ##args)
#define log_errno(fmt, args...) do_log(LOG_ERR, fmt ": errno: %s (%d)\n", ##args, strerror(errno), errno)
+#ifndef DEFAULT_HASH_ALGO
+#define DEFAULT_HASH_ALGO "sha1"
+#endif
+
#define DATA_SIZE 4096
#define SHA1_HASH_LEN 20
diff --git a/src/libimaevm.c b/src/libimaevm.c
index 8e9615796153..2555e58a873b 100644
--- a/src/libimaevm.c
+++ b/src/libimaevm.c
@@ -88,7 +88,7 @@ static const char *const pkey_hash_algo_kern[PKEY_HASH__LAST] = {
struct libimaevm_params imaevm_params = {
.verbose = LOG_INFO,
.x509 = 1,
- .hash_algo = "sha1",
+ .hash_algo = DEFAULT_HASH_ALGO,
};
static void __attribute__ ((constructor)) libinit(void);
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v3 ima-evm-utils 2/2] make SHA-256 the default hash algorithm
2021-08-20 22:49 [PATCH v3 ima-evm-utils 0/2] make default hash algorithm dynamic Bruno Meneguele
2021-08-20 22:49 ` [PATCH v3 ima-evm-utils 1/2] set default hash algorithm in configuration time Bruno Meneguele
@ 2021-08-20 22:49 ` Bruno Meneguele
1 sibling, 0 replies; 4+ messages in thread
From: Bruno Meneguele @ 2021-08-20 22:49 UTC (permalink / raw)
To: zohar, Simon.THOBY, kgold; +Cc: linux-integrity, Bruno Meneguele
The SHA-1 algorithm is considered a weak hash algorithm and there has been
some movement within certain distros to drop its support completely or at
least drop it from the default behavior. ima-evm-utils uses it as the
default algorithm in case the user doesn't explicitly ask for another
through the --with-default-hash configuration time option or --hashalgo/-a
runtime option. With that, make SHA-256 the default hash algorithm instead.
Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
---
m4/default-hash-algo.m4 | 2 +-
src/imaevm.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/m4/default-hash-algo.m4 b/m4/default-hash-algo.m4
index 14be44731ba6..eeb21751f6be 100644
--- a/m4/default-hash-algo.m4
+++ b/m4/default-hash-algo.m4
@@ -9,7 +9,7 @@ AC_DEFUN([AX_DEFAULT_HASH_ALGO], [
AC_ARG_WITH([default_hash],
AS_HELP_STRING([--with-default-hash=ALGORITHM], [specifies the default hash algorithm to be used]),
[HASH_ALGO=$withval],
- [HASH_ALGO=sha1])
+ [HASH_ALGO=sha256])
AC_CHECK_FILE([$CRYPTO_FILE],
[HAVE_CRYPTO_FILE=yes],
diff --git a/src/imaevm.h b/src/imaevm.h
index cc3dfd2e9163..ba7b23907669 100644
--- a/src/imaevm.h
+++ b/src/imaevm.h
@@ -75,7 +75,7 @@
#define log_errno(fmt, args...) do_log(LOG_ERR, fmt ": errno: %s (%d)\n", ##args, strerror(errno), errno)
#ifndef DEFAULT_HASH_ALGO
-#define DEFAULT_HASH_ALGO "sha1"
+#define DEFAULT_HASH_ALGO "sha256"
#endif
#define DATA_SIZE 4096
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread