Use System.IO.Hashing.Crc32

ValveResourceFormat · Jan 7, 2024 · fd4f57b · fd4f57b
1 parent 0becf3c
commit fd4f57b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 90 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,6 +16,7 @@
  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
  <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
  <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <AnalysisMode>AllEnabledByDefault</AnalysisMode>
  </PropertyGroup>
  <PropertyGroup>
  <Authors>ValvePak Contributors</Authors>

diff --git a/ValvePak/ValvePak.Test/ValvePak.Test.csproj b/ValvePak/ValvePak.Test/ValvePak.Test.csproj
@@ -6,7 +6,6 @@
  <IsTestProject>true</IsTestProject>
  <SignAssembly>true</SignAssembly>
  <AssemblyOriginatorKeyFile>../ValvePak/ValvePak.snk</AssemblyOriginatorKeyFile>
- <AnalysisMode>AllEnabledByDefault</AnalysisMode>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/ValvePak/ValvePak/Package.Read.cs b/ValvePak/ValvePak/Package.Read.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Hashing;
 using System.IO.MemoryMappedFiles;
 using System.Runtime.CompilerServices;
 using System.Text;
@@ -158,7 +159,7 @@ public void ReadEntry(PackageEntry entry, byte[] output, bool validateCrc = true
  return;
  }
 
- var actualChecksum = Crc32.Compute(output, totalLength);
+ var actualChecksum = Crc32.HashToUInt32(output.AsSpan(0, totalLength));
 
  if (entry.CRC32 != actualChecksum)
  {

diff --git a/ValvePak/ValvePak/Package.Save.cs b/ValvePak/ValvePak/Package.Save.cs
@@ -2,6 +2,7 @@
 using System.Buffers;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Hashing;
 using System.Security.Cryptography;
 using System.Text;
 
@@ -71,7 +72,7 @@ public PackageEntry AddFile(string filePath, byte[] fileData)
  DirectoryName = directory,
  TypeName = extension,
  SmallData = fileData,
- CRC32 = Crc32.Compute(fileData, fileData.Length),
+ CRC32 = Crc32.HashToUInt32(fileData),
  ArchiveIndex = 0x7FFF,
  };
 

diff --git a/ValvePak/ValvePak/Utilities/Crc32.cs b/ValvePak/ValvePak/Utilities/Crc32.cs
diff --git a/ValvePak/ValvePak/ValvePak.csproj b/ValvePak/ValvePak/ValvePak.csproj
@@ -12,16 +12,16 @@
  <PackageIcon>logo.png</PackageIcon>
  <SignAssembly>true</SignAssembly>
  <AssemblyOriginatorKeyFile>ValvePak.snk</AssemblyOriginatorKeyFile>
- <AnalysisMode>AllEnabledByDefault</AnalysisMode>
  </PropertyGroup>
 
  <ItemGroup>
+ <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
  <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
  </ItemGroup>
 
  <ItemGroup>
- <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
- <None Include="..\..\Misc\logo.png" Pack="true" PackagePath="\"/>
+ <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+ <None Include="..\..\Misc\logo.png" Pack="true" PackagePath="\" />
  </ItemGroup>
 
 </Project>