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

diff --git a/src/resource.c b/src/resource.c
index 116873ff..b45db597 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() */
@@ -876,6 +878,34 @@ wim_reshdr_to_data(const struct wim_reshdr *reshdr, WIMStruct *wim, void **buf_r
 	return wim_resource_spec_to_data(&rspec, buf_ret);
 }
 
+int
+wim_reshdr_to_hash(const struct wim_reshdr *reshdr, WIMStruct *wim,
+		   u8 hash[SHA1_HASH_SIZE])
+{
+	struct wim_resource_spec rspec;
+	int ret;
+	struct wim_lookup_table_entry *lte;
+
+	wim_res_hdr_to_spec(reshdr, wim, &rspec);
+
+	lte = new_lookup_table_entry();
+	if (lte == NULL)
+		return WIMLIB_ERR_NOMEM;
+
+	lte_bind_wim_resource_spec(lte, &rspec);
+	lte->flags = rspec.flags;
+	lte->size = rspec.uncompressed_size;
+	lte->offset_in_res = 0;
+	lte->unhashed = 1;
+
+	ret = sha1_stream(lte);
+
+	lte_unbind_wim_resource_spec(lte);
+	copy_hash(hash, lte->hash);
+	free_lookup_table_entry(lte);
+	return ret;
+}
+
 struct streamifier_context {
 	struct read_stream_list_callbacks cbs;
 	struct wim_lookup_table_entry *cur_stream;
@@ -989,6 +1019,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 +1058,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;