From 7224c8746aa44249d1b1c12088e6d4aeefa4ac22 Mon Sep 17 00:00:00 2001
From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Mon, 8 Oct 2012 16:47:52 +0400
Subject: [PATCH] Print the new md5 hash after modification in binpatch.

---
 depends/md5/md5wrapper.cpp |  9 +++------
 depends/md5/md5wrapper.h   |  6 +++++-
 library/CMakeLists.txt     |  2 ++
 library/binpatch.cpp       | 11 ++++++++++-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/depends/md5/md5wrapper.cpp b/depends/md5/md5wrapper.cpp
index e12b65780..d9f857c5d 100644
--- a/depends/md5/md5wrapper.cpp
+++ b/depends/md5/md5wrapper.cpp
@@ -36,16 +36,14 @@
  * internal hash function, calling
  * the basic methods from md5.h
  */
-std::string md5wrapper::hashit(std::string text)
+std::string md5wrapper::hashit(unsigned char *data, size_t length)
 {
 	MD5Context ctx;
 
 	//init md5
 	MD5Init(&ctx);
 	//update with our string
-	MD5Update(&ctx,
-		 (unsigned char*)text.c_str(),
-		 text.length());
+	MD5Update(&ctx, data, length);
 
 	//create the hash
 	unsigned char buff[16] = "";
@@ -95,10 +93,9 @@ md5wrapper::~md5wrapper()
  */
 std::string md5wrapper::getHashFromString(std::string text)
 {
-	return this->hashit(text);
+	return this->hashit((unsigned char*)text.data(), text.length());
 }
 
-
 /*
  * creates a MD5 hash from
  * a file specified in "filename" and
diff --git a/depends/md5/md5wrapper.h b/depends/md5/md5wrapper.h
index 1a41192a1..0b534b61d 100644
--- a/depends/md5/md5wrapper.h
+++ b/depends/md5/md5wrapper.h
@@ -31,7 +31,7 @@ class md5wrapper
 		 * internal hash function, calling
 		 * the basic methods from md5.h
 		 */
-		std::string hashit(std::string text);
+		std::string hashit(unsigned char *data, size_t length);
 
 		/*
 		 * converts the numeric giets to
@@ -52,6 +52,10 @@ class md5wrapper
 		 */
 		std::string getHashFromString(std::string text);
 
+		std::string getHashFromBytes(const unsigned char *data, size_t size) {
+			return hashit(const_cast<unsigned char*>(data),size);
+		}
+
 		/*
 		 * creates a MD5 hash from
 		 * a file specified in "filename" and
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index a6ce58877..6f33d5c8a 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -249,7 +249,9 @@ ADD_LIBRARY(dfhack-client SHARED RemoteClient.cpp ColorText.cpp MiscUtils.cpp ${
 ADD_DEPENDENCIES(dfhack-client dfhack)
 
 ADD_EXECUTABLE(dfhack-run dfhack-run.cpp)
+
 ADD_EXECUTABLE(binpatch binpatch.cpp)
+TARGET_LINK_LIBRARIES(binpatch dfhack-md5)
 
 IF(BUILD_EGGY)
     SET_TARGET_PROPERTIES(dfhack PROPERTIES OUTPUT_NAME "egg" )
diff --git a/library/binpatch.cpp b/library/binpatch.cpp
index 88ef2f004..815ac5b92 100644
--- a/library/binpatch.cpp
+++ b/library/binpatch.cpp
@@ -53,6 +53,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <memory>
 
+#include <md5wrapper.h>
+
 using std::cout;
 using std::cerr;
 using std::endl;
@@ -222,6 +224,12 @@ bool save_file(const std::vector<patch_byte> &pvec, std::string fname)
     return cnt == pvec.size();
 }
 
+std::string compute_hash(const std::vector<patch_byte> &pvec)
+{
+    md5wrapper md5;
+    return md5.getHashFromBytes(pvec.data(), pvec.size());
+}
+
 int main (int argc, char *argv[])
 {
     if (argc <= 3)
@@ -300,6 +308,7 @@ int main (int argc, char *argv[])
     if (!save_file(bindata, exe_file))
         return 1;
 
-    cout << "Patched " << patch.entries.size() << " bytes." << endl;
+    cout << "Patched " << patch.entries.size()
+         << " bytes, new hash: " << compute_hash(bindata) << endl;
     return 0;
 }