Fixed issues on Windows with multi-dll-hash code.

Author: jonsimantov

analytics/src/analytics_desktop.cc

@@ -63,7 +63,7 @@ void Initialize(const App& app) {
   if (!g_analytics_module) {
     std::vector<std::string> allowed_hashes;
     for (int i=0; i < FirebaseAnalytics_KnownWindowsDllHashCount; i++) {
-      allowed_hashes.push_back(FirebaseAnalytics_KnownWindowsDllHash[i]);
+      allowed_hashes.push_back(std::string(FirebaseAnalytics_KnownWindowsDllHashes[i]));
     }
 
     g_analytics_module =

analytics/src/analytics_windows.cc

@@ -204,7 +204,7 @@ static std::string CalculateFileSha256(HANDLE hFile) {
   }
 
   // Remove the null terminator from the string.
-  hex_hash_string.resize(hex_string_size - 1);
+  hex_hash_string.resize(hex_string_size);
 
   // --- Final Cleanup ---
   CryptDestroyHash(hHash);
@@ -287,6 +287,9 @@ HMODULE VerifyAndLoadAnalyticsLibrary(
         hash_matched = true;
         break;
       }
+      else {
+	LogDebug(LOG_TAG "Hash mismatch: got %s expected %s", calculated_hash.c_str(), expected_hash.c_str());
+      }
     }
 
     if (hash_matched) {

analytics/src/analytics_windows.h

@@ -17,6 +17,7 @@
 
 #include <windows.h>
 
+#include <string>
 #include <vector>
 
 namespace firebase {
@@ -25,7 +26,7 @@ namespace internal {
 
 HMODULE VerifyAndLoadAnalyticsLibrary(
     const wchar_t* library_filename,
-    const std::vector<std::vector<unsigned char>>& allowed_hashes);
+    const std::vector<std::string>& allowed_hashes);
 
 }  // namespace internal
 }  // namespace analytics