From 1b663b02fef49f0eac5858e17e8c47c7c9b7d831 Mon Sep 17 00:00:00 2001 From: Rick van der Zwet Date: Thu, 17 Nov 2022 20:59:09 +0100 Subject: [PATCH] Fix m14600 confusing error message on container without payload data When multiple error messages are available, prioritize any parsing error over PARSER_LUKS_KEY_DISABLED. This takes priority since it more meaningfull to report to user. --- src/modules/module_14600.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/modules/module_14600.c b/src/modules/module_14600.c index fa6a0f4d5..8f6774164 100644 --- a/src/modules/module_14600.c +++ b/src/modules/module_14600.c @@ -243,7 +243,10 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE if (parser_status != PARSER_OK) { - last_error = parser_status; + if (parser_status != PARSER_LUKS_KEY_DISABLED) + { + last_error = parser_status; + } continue; } @@ -252,7 +255,14 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE if (hashes_cnt == 0) { - return last_error; + if (last_error != 0) + { + return last_error; + } + else + { + return PARSER_LUKS_KEY_DISABLED; + } } else {