Merge pull request #3511 from rickvanderzwet/issue-3484-m14600-error-handling-on-container-without-payload

Fix m14600 confusing error message on container without payload data
2 years ago · b3095acc8b
parent 18fcf28d64 1b663b02fe
commit b3095acc8b
1 changed files with 12 additions and 2 deletions
--- 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
  {