diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-28 22:05:13 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 15:50:47 -0600 |
commit | 7d8072cce7aae6c889b0979202b5ee285d0a35c9 (patch) | |
tree | b05d07a608e16e1b18c5d5754ddc442526a9e796 /src | |
parent | 4fc415440e64394ef9adafbf802620d73b6dade0 (diff) | |
download | wix-7d8072cce7aae6c889b0979202b5ee285d0a35c9.tar.gz wix-7d8072cce7aae6c889b0979202b5ee285d0a35c9.tar.bz2 wix-7d8072cce7aae6c889b0979202b5ee285d0a35c9.zip |
Change the hash algorithm for Burn to SHA512.
#3992
Diffstat (limited to 'src')
-rw-r--r-- | src/WixToolset.Core.Burn/Bundles/BundleHashAlgorithm.cs | 2 | ||||
-rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/WixToolset.Core.Burn/Bundles/BundleHashAlgorithm.cs b/src/WixToolset.Core.Burn/Bundles/BundleHashAlgorithm.cs index 3a71ed4c..3b4a4156 100644 --- a/src/WixToolset.Core.Burn/Bundles/BundleHashAlgorithm.cs +++ b/src/WixToolset.Core.Burn/Bundles/BundleHashAlgorithm.cs | |||
@@ -12,7 +12,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
12 | { | 12 | { |
13 | byte[] hashBytes; | 13 | byte[] hashBytes; |
14 | 14 | ||
15 | using (var managed = new SHA1Managed()) | 15 | using (var managed = new SHA512CryptoServiceProvider()) |
16 | using (var stream = fileInfo.OpenRead()) | 16 | using (var stream = fileInfo.OpenRead()) |
17 | { | 17 | { |
18 | hashBytes = managed.ComputeHash(stream); | 18 | hashBytes = managed.ComputeHash(stream); |
diff --git a/src/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs index 77a21f61..75ab4382 100644 --- a/src/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs | |||
@@ -49,6 +49,10 @@ namespace WixToolsetTest.CoreIntegration | |||
49 | }; | 49 | }; |
50 | Assert.Equal(1, exePackageElements.Count); | 50 | Assert.Equal(1, exePackageElements.Count); |
51 | Assert.Equal("<ExePackage Id='PackagePayloadInPayloadGroup' Cache='yes' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_PackagePayloadInPayloadGroup' RollbackLogPathVariable='WixBundleRollbackLog_PackagePayloadInPayloadGroup' DetectCondition='none' InstallArguments='' UninstallArguments='' RepairArguments='' Repairable='no'><PayloadRef Id='burn.exe' /></ExePackage>", exePackageElements[0].GetTestXml(ignoreAttributesByElementName)); | 51 | Assert.Equal("<ExePackage Id='PackagePayloadInPayloadGroup' Cache='yes' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_PackagePayloadInPayloadGroup' RollbackLogPathVariable='WixBundleRollbackLog_PackagePayloadInPayloadGroup' DetectCondition='none' InstallArguments='' UninstallArguments='' RepairArguments='' Repairable='no'><PayloadRef Id='burn.exe' /></ExePackage>", exePackageElements[0].GetTestXml(ignoreAttributesByElementName)); |
52 | |||
53 | var payloadElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload[@Id='burn.exe']"); | ||
54 | Assert.Equal(1, payloadElements.Count); | ||
55 | Assert.Equal("<Payload Id='burn.exe' FilePath='burn.exe' FileSize='463360' Hash='F6E722518AC3AB7E31C70099368D5770788C179AA23226110DCF07319B1E1964E246A1E8AE72E2CF23E0138AFC281BAFDE45969204405E114EB20C8195DA7E5E' Packaging='embedded' SourcePath='a0' Container='WixAttachedContainer' />", payloadElements[0].GetTestXml()); | ||
52 | } | 56 | } |
53 | } | 57 | } |
54 | 58 | ||