X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fresource.c;h=b11e157aa4436faed51fa9896ff4777f324d23f9;hb=54d3007554444024077d89091d63e4a250fedd01;hp=116873ffc16b68d9be4c590631a4f2167964722a;hpb=b6034a5dd44709341c46d553b1c0294ec91f13e4;p=wimlib

diff --git a/src/resource.c b/src/resource.c
index 116873ff..b11e157a 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -27,12 +27,14 @@
 #endif
 
 #include "wimlib.h"
+#include "wimlib/assert.h"
 #include "wimlib/endianness.h"
 #include "wimlib/error.h"
 #include "wimlib/file_io.h"
 #include "wimlib/lookup_table.h"
 #include "wimlib/resource.h"
 #include "wimlib/sha1.h"
+#include "wimlib/wim.h"
 
 #ifdef __WIN32__
 /* for read_win32_file_prefix(), read_win32_encrypted_file_prefix() */
@@ -989,6 +991,13 @@ hasher_consume_chunk(const void *chunk, size_t size, void *_ctx)
 		return (*ctx->cbs.consume_chunk)(chunk, size, ctx->cbs.consume_chunk_ctx);
 }
 
+static void
+get_sha1_string(const u8 md[SHA1_HASH_SIZE], tchar *str)
+{
+	for (size_t i = 0; i < SHA1_HASH_SIZE; i++)
+		str += tsprintf(str, T("%02x"), md[i]);
+}
+
 /* Callback for finishing reading a stream while calculating its SHA1 message
  * digest.  */
 static int
@@ -1021,9 +1030,14 @@ hasher_end_stream(struct wim_lookup_table_entry *lte, int status, void *_ctx)
 			 * that it is the same as the calculated value.  */
 			if (!hashes_equal(hash, lte->hash)) {
 				if (wimlib_print_errors) {
-					ERROR("Invalid SHA1 message digest "
-					      "on the following WIM stream:");
-					print_lookup_table_entry(lte, stderr);
+					tchar expected_hashstr[SHA1_HASH_SIZE * 2 + 1];
+					tchar actual_hashstr[SHA1_HASH_SIZE * 2 + 1];
+					get_sha1_string(lte->hash, expected_hashstr);
+					get_sha1_string(hash, actual_hashstr);
+					ERROR("The stream is corrupted!\n"
+					      "        (Expected SHA1=%"TS",\n"
+					      "              got SHA1=%"TS")",
+					      expected_hashstr, actual_hashstr);
 				}
 				ret = WIMLIB_ERR_INVALID_RESOURCE_HASH;
 				errno = EINVAL;