From 6a45cb7687de57056532fe897a708435deec2ea3 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Fri, 9 Sep 2022 21:21:55 -0400
Subject: Update hashes are now hex strings.

Fixes https://github.com/wixtoolset/issues/issues/6901.
---
 .../WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h   | 3 +--
 src/api/burn/WixToolset.Mba.Core/Engine.cs                        | 4 ++--
 src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs           | 8 +++-----
 src/api/burn/WixToolset.Mba.Core/IEngine.cs                       | 2 +-
 src/api/burn/balutil/BalBootstrapperEngine.cpp                    | 6 ++----
 src/api/burn/balutil/inc/IBootstrapperEngine.h                    | 3 +--
 6 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'src/api')

diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
index cdb01330..941e4241 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
@@ -381,8 +381,7 @@ typedef struct _BAENGINE_SETUPDATE_ARGS
     LPCWSTR wzDownloadSource;
     DWORD64 qwSize;
     BOOTSTRAPPER_UPDATE_HASH_TYPE hashType;
-    BYTE* rgbHash;
-    DWORD cbHash;
+    LPCWSTR wzHash;
 } BAENGINE_SETUPDATE_ARGS;
 
 typedef struct _BAENGINE_SETUPDATE_RESULTS
diff --git a/src/api/burn/WixToolset.Mba.Core/Engine.cs b/src/api/burn/WixToolset.Mba.Core/Engine.cs
index 5ebada36..e7ab533b 100644
--- a/src/api/burn/WixToolset.Mba.Core/Engine.cs
+++ b/src/api/burn/WixToolset.Mba.Core/Engine.cs
@@ -240,9 +240,9 @@ namespace WixToolset.Mba.Core
         }
 
         /// <inheritdoc/>
-        public void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, byte[] hash)
+        public void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, string hash)
         {
-            this.engine.SetUpdate(localSource, downloadSource, size, hashType, hash, null == hash ? 0 : hash.Length);
+            this.engine.SetUpdate(localSource, downloadSource, size, hashType, hash);
         }
 
         /// <inheritdoc/>
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs
index fdc9c3f6..408c9955 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs
@@ -123,21 +123,19 @@ namespace WixToolset.Mba.Core
             );
 
         /// <summary>
-        /// See <see cref="IEngine.SetUpdate(string, string, long, UpdateHashType, byte[])"/>.
+        /// See <see cref="IEngine.SetUpdate(string, string, long, UpdateHashType, string)"/>.
         /// </summary>
         /// <param name="wzLocalSource"></param>
         /// <param name="wzDownloadSource"></param>
         /// <param name="qwValue"></param>
         /// <param name="hashType"></param>
-        /// <param name="rgbHash"></param>
-        /// <param name="cbHash"></param>
+        /// <param name="wzHash"></param>
         void SetUpdate(
             [MarshalAs(UnmanagedType.LPWStr)] string wzLocalSource,
             [MarshalAs(UnmanagedType.LPWStr)] string wzDownloadSource,
             [MarshalAs(UnmanagedType.U8)] long qwValue,
             [MarshalAs(UnmanagedType.U4)] UpdateHashType hashType,
-            [MarshalAs(UnmanagedType.LPArray, SizeParamIndex=4)] byte[] rgbHash,
-            [MarshalAs(UnmanagedType.U4)] int cbHash
+            [MarshalAs(UnmanagedType.LPWStr)] string wzHash
             );
 
         /// <summary>
diff --git a/src/api/burn/WixToolset.Mba.Core/IEngine.cs b/src/api/burn/WixToolset.Mba.Core/IEngine.cs
index 3e636961..2b9a90e0 100644
--- a/src/api/burn/WixToolset.Mba.Core/IEngine.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IEngine.cs
@@ -142,7 +142,7 @@ namespace WixToolset.Mba.Core
         /// <param name="size">Size of the expected update.</param>
         /// <param name="hashType">Type of the hash expected on the update.</param>
         /// <param name="hash">Optional hash expected for the update.</param>
-        void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, byte[] hash);
+        void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, string hash);
 
         /// <summary>
         /// Sets the URL to the update feed.
diff --git a/src/api/burn/balutil/BalBootstrapperEngine.cpp b/src/api/burn/balutil/BalBootstrapperEngine.cpp
index 301b88a5..898a8a15 100644
--- a/src/api/burn/balutil/BalBootstrapperEngine.cpp
+++ b/src/api/burn/balutil/BalBootstrapperEngine.cpp
@@ -312,8 +312,7 @@ public: // IBootstrapperEngine
         __in_z_opt LPCWSTR wzDownloadSource,
         __in DWORD64 qwSize,
         __in BOOTSTRAPPER_UPDATE_HASH_TYPE hashType,
-        __in_bcount_opt(cbHash) BYTE* rgbHash,
-        __in DWORD cbHash
+        __in_z_opt LPCWSTR wzHash
         )
     {
         BAENGINE_SETUPDATE_ARGS args = { };
@@ -324,8 +323,7 @@ public: // IBootstrapperEngine
         args.wzDownloadSource = wzDownloadSource;
         args.qwSize = qwSize;
         args.hashType = hashType;
-        args.rgbHash = rgbHash;
-        args.cbHash = cbHash;
+        args.wzHash = wzHash;
 
         results.cbSize = sizeof(results);
 
diff --git a/src/api/burn/balutil/inc/IBootstrapperEngine.h b/src/api/burn/balutil/inc/IBootstrapperEngine.h
index ccb07f4f..2a108223 100644
--- a/src/api/burn/balutil/inc/IBootstrapperEngine.h
+++ b/src/api/burn/balutil/inc/IBootstrapperEngine.h
@@ -65,8 +65,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
         __in_z_opt LPCWSTR wzDownloadSource,
         __in DWORD64 qwSize,
         __in BOOTSTRAPPER_UPDATE_HASH_TYPE hashType,
-        __in_bcount_opt(cbHash) BYTE* rgbHash,
-        __in DWORD cbHash
+        __in_z_opt LPCWSTR wzHash
         ) = 0;
 
     STDMETHOD(SetLocalSource)(
-- 
cgit v1.2.3-55-g6feb