make default hash algorithm dynamic
v5 cover make default hash algorithm dynamic
In order to allow users to set their own security policies, this patch adds an option in configuration time to set the default hash algorithm to be used. Considering that any hash algorithm supported by the kernel can be used, the chosen algo is then checked against the hash_info.h header file.
At the same time, move from SHA1 to SHA256 default hash algorithm, following the general movement of dropping SHA1 support in the major distros due to its weaknesses.
Changelog:
v4: check against hash_info.h kernel header instead of /proc/crypto
v3: remove wrong comment from m4 script
v2: add a config time option for setting DEFAULT_HASH_ALGO.
Bruno Meneguele (2):
set default hash algorithm in configuration time make SHA-256 the default hash algorithm
README | 2 +- configure.ac | 2 ++ m4/default-hash-algo.m4 | 34 ++++++++++++++++++++++++++++++++++ src/evmctl.c | 4 ++-- src/imaevm.h | 4 ++++ src/libimaevm.c | 2 +- 6 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 m4/default-hash-algo.m4
Signature · 1 line
2.31.1
PATCH v5 1/2 set default hash algorithm in configuration time
The default hash algorithm for evmctl is today hardcoded in the libimaevm.c file. To facilitate package maintainers across different distributions to set their own default hash algorithm this, patch adds the --with-default-hash=<algo> option to the configuration script.
The chosen algorithm will then be checked by its available in the kernel, otherwise IMA won't be able to verify files hashed by the user. For that, the kernel header hash_info.h used as the source of supported hashes. In case the hash_info.h header is not present, the configuration script warns about it, but uses whatever the user specified in the option.
--- README | 2 +- configure.ac | 2 ++ m4/default-hash-algo.m4 | 34 ++++++++++++++++++++++++++++++++++ src/evmctl.c | 4 ++-- src/imaevm.h | 4 ++++ src/libimaevm.c | 2 +- 6 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 m4/default-hash-algo.m4
README +1 -1
@@ -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
configure.ac +2 -0
@@ -62,6 +62,7 @@ else fi EVMCTL_MANPAGE_DOCBOOK_XSL +AX_DEFAULT_HASH_ALGO([$KERNEL_HEADERS]) # for gcov #CFLAGS="$CFLAGS -Wall -fprofile-arcs -ftest-coverage"
@@ -81,6 +82,7 @@ echo echo echo "Configuration:" echo " debug: $pkg_cv_enable_debug" +echo " default-hash: $HASH_ALGO" echo " openssl-conf: $enable_openssl_conf" echo " tss2-esys: $ac_cv_lib_tss2_esys_Esys_Free" echo " tss2-rc-decode: $ac_cv_lib_tss2_rc_Tss2_RC_Decode"
m4/default-hash-algo.m4 new file +34 -0
@@ -0,0 +1,34 @@ +dnl Copyright (c) 2021 Bruno Meneguele <[email protected]> +dnl Check hash algorithm availability in the kernel +dnl +dnl $1 - $KERNEL_HEADERS + +AC_DEFUN([AX_DEFAULT_HASH_ALGO], [ + HASH_INFO_HEADER="$1/include/uapi/linux/hash_info.h" + + 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_HEADER([$HASH_INFO_HEADER], + [HAVE_HASH_INFO_HEADER=yes], + [AC_MSG_WARN([$HASH_INFO_HEADER not found.])]) + + if test "x$HAVE_HASH_INFO_HEADER" = "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 + AC_PROG_SED() + AC_PROG_GREP() + $SED -n 's/HASH_ALGO_\(.*\),/\L\1\E/p' $HASH_INFO_HEADER | $GREP -w -i $HASH_ALGO > /dev/null + have_hash=$? + + if test $have_hash -ne 0; 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 +])
src/evmctl.c +2 -2
@@ -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[] = {
src/imaevm.h +4 -0
@@ -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
src/libimaevm.c +1 -1
@@ -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 );
Signature · 1 line
2.31.1
Mimi Zohar
maintainerRe: [PATCH v5 ima-evm-utils 1/2] set default hash algorithm in configuration time
Quoted 6 lines · Bruno Meneguele
m4/default-hash-algo.m4 new file +6
-0+ 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_HEADER([$HASH_INFO_HEADER],
m4/default-hash-algo.m4 line 24
Quoted 10 lines
m4/default-hash-algo.m4 new file +10
-0+ [HAVE_HASH_INFO_HEADER=yes], + [AC_MSG_WARN([$HASH_INFO_HEADER not found.])]) + + if test "x$HAVE_HASH_INFO_HEADER" = "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 + AC_PROG_SED() + AC_PROG_GREP() + $SED -n 's/HASH_ALGO_\(.*\),/\L\1\E/p' $HASH_INFO_HEADER | $GREP -w -i $HASH_ALGO > /dev/null
This does an a case insensitive test for the hash algorithm, but the code itself doesn't support upper case hash algorithms (e.g. SHA1, SHA256).
thanks,
Mimi
Quoted 8 lines
m4/default-hash-algo.m4 new file +8
-0+ have_hash=$? + + if test $have_hash -ne 0; 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
Re: [PATCH v5 ima-evm-utils 1/2] set default hash algorithm in configuration time
Quoted 13 lines · Mimi Zohar
Quoted 12 lines · Bruno Meneguele
m4/default-hash-algo.m4 new file +12
-0+ 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_HEADER([$HASH_INFO_HEADER], + [HAVE_HASH_INFO_HEADER=yes], + [AC_MSG_WARN([$HASH_INFO_HEADER not found.])]) + + if test "x$HAVE_HASH_INFO_HEADER" = "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])
Quoted 9 lines
m4/default-hash-algo.m4 line 24
Quoted 4 lines
m4/default-hash-algo.m4 new file +4
-0+ else + AC_PROG_SED() + AC_PROG_GREP() + $SED -n 's/HASH_ALGO_\(.*\),/\L\1\E/p' $HASH_INFO_HEADER | $GREP -w -i $HASH_ALGO > /dev/nullThis does an a case insensitive test for the hash algorithm, but the code itself doesn't support upper case hash algorithms (e.g. SHA1, SHA256).
This case-insensitive is actually redundant here, since in the 'sed' I'm already lowering the case with '\L\1\E'. Will remove it.
Quoted 15 lines
thanks,
Mimi
Quoted 8 lines
m4/default-hash-algo.m4 new file +8
-0+ have_hash=$? + + if test $have_hash -ne 0; 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
Signature · 2 lines
bmeneg PGP Key: http://bmeneg.com/pubkey.txt
PATCH v6 1/2 set default hash algorithm in configuration time
In reply to Bruno MenegueleThe default hash algorithm for evmctl is today hardcoded in the libimaevm.c file. To facilitate package maintainers across different distributions to set their own default hash algorithm this, patch adds the --with-default-hash=<algo> option to the configuration script.
The chosen algorithm will then be checked by its available in the kernel, otherwise IMA won't be able to verify files hashed by the user. For that, the kernel header hash_info.h used as the source of supported hashes. In case the hash_info.h header is not present, the configuration script warns about it, but uses whatever the user specified in the option.
---
Changelog:
v5 - remove case insensitive grep (suggested by Mimi)
README | 2 +- configure.ac | 2 ++ m4/default-hash-algo.m4 | 34 ++++++++++++++++++++++++++++++++++ src/evmctl.c | 4 ++-- src/imaevm.h | 4 ++++ src/libimaevm.c | 2 +- 6 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 m4/default-hash-algo.m4
README +1 -1
@@ -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
configure.ac +2 -0
@@ -62,6 +62,7 @@ else fi EVMCTL_MANPAGE_DOCBOOK_XSL +AX_DEFAULT_HASH_ALGO([$KERNEL_HEADERS]) # for gcov #CFLAGS="$CFLAGS -Wall -fprofile-arcs -ftest-coverage"
@@ -81,6 +82,7 @@ echo echo echo "Configuration:" echo " debug: $pkg_cv_enable_debug" +echo " default-hash: $HASH_ALGO" echo " openssl-conf: $enable_openssl_conf" echo " tss2-esys: $ac_cv_lib_tss2_esys_Esys_Free" echo " tss2-rc-decode: $ac_cv_lib_tss2_rc_Tss2_RC_Decode"
m4/default-hash-algo.m4 new file +34 -0
@@ -0,0 +1,34 @@ +dnl Copyright (c) 2021 Bruno Meneguele <[email protected]> +dnl Check hash algorithm availability in the kernel +dnl +dnl $1 - $KERNEL_HEADERS + +AC_DEFUN([AX_DEFAULT_HASH_ALGO], [ + HASH_INFO_HEADER="$1/include/uapi/linux/hash_info.h" + + 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_HEADER([$HASH_INFO_HEADER], + [HAVE_HASH_INFO_HEADER=yes], + [AC_MSG_WARN([$HASH_INFO_HEADER not found.])]) + + if test "x$HAVE_HASH_INFO_HEADER" = "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 + AC_PROG_SED() + AC_PROG_GREP() + $SED -n 's/HASH_ALGO_\(.*\),/\L\1\E/p' $HASH_INFO_HEADER | $GREP -w $HASH_ALGO > /dev/null + have_hash=$? + + if test $have_hash -ne 0; 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 +])
src/evmctl.c +2 -2
@@ -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[] = {
src/imaevm.h +4 -0
@@ -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
src/libimaevm.c +1 -1
@@ -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 );
Signature · 1 line
2.31.1
PATCH v5 2/2 make SHA-256 the default hash algorithm
In reply to Bruno MenegueleThe 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.
--- m4/default-hash-algo.m4 | 2 +- src/imaevm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
m4/default-hash-algo.m4 +1 -1
@@ -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_HEADER([$HASH_INFO_HEADER], [HAVE_HASH_INFO_HEADER=yes],
src/imaevm.h +1 -1
@@ -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
Signature · 1 line
2.31.1