From 84d3981e7b6bc4efe3c1bcbaa6f4198f4c523204 Mon Sep 17 00:00:00 2001
From: Jens Steube <jens.steube@gmail.com>
Date: Wed, 27 May 2020 15:23:02 +0200
Subject: [PATCH] Add returncode PARSER_HAVE_ERRNO as a valid returncode from
 module_hash_binary_count() and module_hash_binary_parse() module hooks. You
 can use this in case fopen() fails and you want to transport back the
 original error from the OS

---
 include/types.h            |  1 +
 src/hashes.c               | 19 +++++++++++++++----
 src/modules/module_02500.c |  4 ++--
 src/modules/module_02501.c |  4 ++--
 src/modules/module_06211.c |  2 +-
 src/modules/module_06212.c |  2 +-
 src/modules/module_06213.c |  2 +-
 src/modules/module_06221.c |  2 +-
 src/modules/module_06222.c |  2 +-
 src/modules/module_06223.c |  2 +-
 src/modules/module_06231.c |  2 +-
 src/modules/module_06232.c |  2 +-
 src/modules/module_06233.c |  2 +-
 src/modules/module_06241.c |  2 +-
 src/modules/module_06242.c |  2 +-
 src/modules/module_06243.c |  2 +-
 src/modules/module_13711.c |  2 +-
 src/modules/module_13712.c |  2 +-
 src/modules/module_13713.c |  2 +-
 src/modules/module_13721.c |  2 +-
 src/modules/module_13722.c |  2 +-
 src/modules/module_13723.c |  2 +-
 src/modules/module_13731.c |  2 +-
 src/modules/module_13732.c |  2 +-
 src/modules/module_13733.c |  2 +-
 src/modules/module_13741.c |  2 +-
 src/modules/module_13742.c |  2 +-
 src/modules/module_13743.c |  2 +-
 src/modules/module_13751.c |  2 +-
 src/modules/module_13752.c |  2 +-
 src/modules/module_13753.c |  2 +-
 src/modules/module_13761.c |  2 +-
 src/modules/module_13762.c |  2 +-
 src/modules/module_13763.c |  2 +-
 src/modules/module_13771.c |  2 +-
 src/modules/module_13772.c |  2 +-
 src/modules/module_13773.c |  2 +-
 src/modules/module_14600.c |  2 +-
 src/modules/module_22000.c |  4 ++--
 src/modules/module_22001.c |  4 ++--
 40 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/include/types.h b/include/types.h
index b610b46fa..2dc786fdb 100644
--- a/include/types.h
+++ b/include/types.h
@@ -539,6 +539,7 @@ typedef enum parser_rc
   PARSER_BLOCK_SIZE           = -39,
   PARSER_CIPHER               = -40,
   PARSER_FILE_SIZE            = -41,
+  PARSER_HAVE_ERRNO           = -100,
   PARSER_UNKNOWN_ERROR        = -255
 
 } parser_rc_t;
diff --git a/src/hashes.c b/src/hashes.c
index ab1d7c692..86f9740ab 100644
--- a/src/hashes.c
+++ b/src/hashes.c
@@ -735,21 +735,28 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
       {
         const int binary_count = module_ctx->module_hash_binary_count (hashes);
 
-        if (binary_count == 0)
+        if (binary_count > 0)
+        {
+          hashes_avail = binary_count;
+        }
+        else if (binary_count == 0)
         {
           event_log_error (hashcat_ctx, "No hashes loaded.");
 
           return -1;
         }
-
-        if (binary_count == -1)
+        else if (binary_count == PARSER_HAVE_ERRNO)
         {
           event_log_error (hashcat_ctx, "%s: %s", hashes->hashfile, strerror (errno));
 
           return -1;
         }
+        else
+        {
+          event_log_error (hashcat_ctx, "%s: %s", hashes->hashfile, strerror (binary_count));
 
-        hashes_avail = binary_count;
+          return -1;
+        }
       }
       else
       {
@@ -1289,6 +1296,10 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
           hashes_cnt = hashes_parsed;
         }
         else if (hashes_parsed == 0)
+        {
+          event_log_warning (hashcat_ctx, "No hashes loaded.");
+        }
+        else if (hashes_parsed == PARSER_HAVE_ERRNO)
         {
           event_log_warning (hashcat_ctx, "Hashfile '%s': %s", hashes->hashfile, strerror (errno));
         }
diff --git a/src/modules/module_02500.c b/src/modules/module_02500.c
index 753636dc1..5ae58066e 100644
--- a/src/modules/module_02500.c
+++ b/src/modules/module_02500.c
@@ -376,7 +376,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return -1;
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   char *in = (char *) hcmalloc (sizeof (hccapx_t));
 
@@ -467,7 +467,7 @@ int module_hash_binary_count (MAYBE_UNUSED const hashes_t *hashes)
 {
   struct stat st;
 
-  if (stat (hashes->hashfile, &st) == -1) return -1;
+  if (stat (hashes->hashfile, &st) == -1) return (PARSER_HAVE_ERRNO);
 
   return st.st_size / sizeof (hccapx_t);
 }
diff --git a/src/modules/module_02501.c b/src/modules/module_02501.c
index 41aa86acd..0a5f349f8 100644
--- a/src/modules/module_02501.c
+++ b/src/modules/module_02501.c
@@ -351,7 +351,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return -1;
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   char *in = (char *) hcmalloc (sizeof (hccapx_t));
 
@@ -442,7 +442,7 @@ int module_hash_binary_count (MAYBE_UNUSED const hashes_t *hashes)
 {
   struct stat st;
 
-  if (stat (hashes->hashfile, &st) == -1) return -1;
+  if (stat (hashes->hashfile, &st) == -1) return (PARSER_HAVE_ERRNO);
 
   return st.st_size / sizeof (hccapx_t);
 }
diff --git a/src/modules/module_06211.c b/src/modules/module_06211.c
index ef63c4be4..72906e846 100644
--- a/src/modules/module_06211.c
+++ b/src/modules/module_06211.c
@@ -155,7 +155,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06212.c b/src/modules/module_06212.c
index a2f6fc4bf..e6834511d 100644
--- a/src/modules/module_06212.c
+++ b/src/modules/module_06212.c
@@ -155,7 +155,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06213.c b/src/modules/module_06213.c
index 0cdbd43c5..dd866e6c4 100644
--- a/src/modules/module_06213.c
+++ b/src/modules/module_06213.c
@@ -153,7 +153,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06221.c b/src/modules/module_06221.c
index 2744b6b37..b2131313d 100644
--- a/src/modules/module_06221.c
+++ b/src/modules/module_06221.c
@@ -137,7 +137,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06222.c b/src/modules/module_06222.c
index d4314e47f..099b3e0e5 100644
--- a/src/modules/module_06222.c
+++ b/src/modules/module_06222.c
@@ -137,7 +137,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06223.c b/src/modules/module_06223.c
index ec19b3c56..a26dac667 100644
--- a/src/modules/module_06223.c
+++ b/src/modules/module_06223.c
@@ -135,7 +135,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06231.c b/src/modules/module_06231.c
index e86e09b69..7e59b30e0 100644
--- a/src/modules/module_06231.c
+++ b/src/modules/module_06231.c
@@ -136,7 +136,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06232.c b/src/modules/module_06232.c
index 847c2c3e9..fc0124c3c 100644
--- a/src/modules/module_06232.c
+++ b/src/modules/module_06232.c
@@ -136,7 +136,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06233.c b/src/modules/module_06233.c
index 080976adf..0e88e15b6 100644
--- a/src/modules/module_06233.c
+++ b/src/modules/module_06233.c
@@ -136,7 +136,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06241.c b/src/modules/module_06241.c
index 4ff957c71..3ffb6fe9f 100644
--- a/src/modules/module_06241.c
+++ b/src/modules/module_06241.c
@@ -149,7 +149,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06242.c b/src/modules/module_06242.c
index 048df78b1..98b081416 100644
--- a/src/modules/module_06242.c
+++ b/src/modules/module_06242.c
@@ -149,7 +149,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_06243.c b/src/modules/module_06243.c
index 2ee532815..af318305a 100644
--- a/src/modules/module_06243.c
+++ b/src/modules/module_06243.c
@@ -149,7 +149,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define TC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13711.c b/src/modules/module_13711.c
index 2096bd458..037bd5940 100644
--- a/src/modules/module_13711.c
+++ b/src/modules/module_13711.c
@@ -165,7 +165,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13712.c b/src/modules/module_13712.c
index 8a5f1cf13..5a8465ced 100644
--- a/src/modules/module_13712.c
+++ b/src/modules/module_13712.c
@@ -165,7 +165,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13713.c b/src/modules/module_13713.c
index 7a5360837..589be1f66 100644
--- a/src/modules/module_13713.c
+++ b/src/modules/module_13713.c
@@ -165,7 +165,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13721.c b/src/modules/module_13721.c
index 9680018f1..c5f375352 100644
--- a/src/modules/module_13721.c
+++ b/src/modules/module_13721.c
@@ -166,7 +166,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13722.c b/src/modules/module_13722.c
index 88b7c0862..b17e22383 100644
--- a/src/modules/module_13722.c
+++ b/src/modules/module_13722.c
@@ -166,7 +166,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13723.c b/src/modules/module_13723.c
index bf90814ed..675db5514 100644
--- a/src/modules/module_13723.c
+++ b/src/modules/module_13723.c
@@ -166,7 +166,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13731.c b/src/modules/module_13731.c
index ab2885331..4eb6b39c5 100644
--- a/src/modules/module_13731.c
+++ b/src/modules/module_13731.c
@@ -165,7 +165,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13732.c b/src/modules/module_13732.c
index 7ba12cfca..3b84699dd 100644
--- a/src/modules/module_13732.c
+++ b/src/modules/module_13732.c
@@ -165,7 +165,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13733.c b/src/modules/module_13733.c
index 2dfac5939..b74eb5d0b 100644
--- a/src/modules/module_13733.c
+++ b/src/modules/module_13733.c
@@ -165,7 +165,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13741.c b/src/modules/module_13741.c
index e819dc268..c75b54c25 100644
--- a/src/modules/module_13741.c
+++ b/src/modules/module_13741.c
@@ -167,7 +167,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13742.c b/src/modules/module_13742.c
index 42f09c216..c4f4c8165 100644
--- a/src/modules/module_13742.c
+++ b/src/modules/module_13742.c
@@ -167,7 +167,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13743.c b/src/modules/module_13743.c
index 0c3e07a8b..2b64b8c3c 100644
--- a/src/modules/module_13743.c
+++ b/src/modules/module_13743.c
@@ -167,7 +167,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13751.c b/src/modules/module_13751.c
index df3dab805..db59b7da4 100644
--- a/src/modules/module_13751.c
+++ b/src/modules/module_13751.c
@@ -184,7 +184,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13752.c b/src/modules/module_13752.c
index c2675a0e1..24a542653 100644
--- a/src/modules/module_13752.c
+++ b/src/modules/module_13752.c
@@ -184,7 +184,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13753.c b/src/modules/module_13753.c
index df061adce..8617b90ab 100644
--- a/src/modules/module_13753.c
+++ b/src/modules/module_13753.c
@@ -184,7 +184,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13761.c b/src/modules/module_13761.c
index d121c9928..dd3385d3d 100644
--- a/src/modules/module_13761.c
+++ b/src/modules/module_13761.c
@@ -186,7 +186,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13762.c b/src/modules/module_13762.c
index a772f9180..3c4376e88 100644
--- a/src/modules/module_13762.c
+++ b/src/modules/module_13762.c
@@ -186,7 +186,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13763.c b/src/modules/module_13763.c
index 885e9c1c6..9e1e94fd0 100644
--- a/src/modules/module_13763.c
+++ b/src/modules/module_13763.c
@@ -186,7 +186,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13771.c b/src/modules/module_13771.c
index 21ab8fc58..390477186 100644
--- a/src/modules/module_13771.c
+++ b/src/modules/module_13771.c
@@ -169,7 +169,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13772.c b/src/modules/module_13772.c
index ce9a1edd8..458091fe4 100644
--- a/src/modules/module_13772.c
+++ b/src/modules/module_13772.c
@@ -169,7 +169,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_13773.c b/src/modules/module_13773.c
index ed658c123..5d3f58c25 100644
--- a/src/modules/module_13773.c
+++ b/src/modules/module_13773.c
@@ -169,7 +169,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   #define VC_HEADER_SIZE 512
 
diff --git a/src/modules/module_14600.c b/src/modules/module_14600.c
index f506ef58a..4affa0e49 100644
--- a/src/modules/module_14600.c
+++ b/src/modules/module_14600.c
@@ -377,7 +377,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, (const char *) line_buf, "rb") == false) return (PARSER_HASH_FILE);
+  if (hc_fopen (&fp, (const char *) line_buf, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   struct luks_phdr hdr;
 
diff --git a/src/modules/module_22000.c b/src/modules/module_22000.c
index b914157e4..32b9b5ffe 100644
--- a/src/modules/module_22000.c
+++ b/src/modules/module_22000.c
@@ -171,7 +171,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return -1;
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   const bool r = is_hccapx (&fp);
 
@@ -258,7 +258,7 @@ int module_hash_binary_count (MAYBE_UNUSED const hashes_t *hashes)
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return -1;
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   const bool r = is_hccapx (&fp);
 
diff --git a/src/modules/module_22001.c b/src/modules/module_22001.c
index 9a3465266..7937d5211 100644
--- a/src/modules/module_22001.c
+++ b/src/modules/module_22001.c
@@ -172,7 +172,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return -1;
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   const bool r = is_hccapx (&fp);
 
@@ -259,7 +259,7 @@ int module_hash_binary_count (MAYBE_UNUSED const hashes_t *hashes)
 
   HCFILE fp;
 
-  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return -1;
+  if (hc_fopen (&fp, hashes->hashfile, "rb") == false) return (PARSER_HAVE_ERRNO);
 
   const bool r = is_hccapx (&fp);