.

Author: SimonCropp

src/DeterministicIoPackaging/GlobalUsings.cs

@@ -1,3 +1,3 @@
-global using System.Globalization;
 global using System.IO.Compression;
-global using System.Xml.Linq;
+global using System.IO.Hashing;
+global using System.Xml.Linq;

src/DeterministicIoPackaging/PngNormalizer.cs

@@ -1,5 +1,4 @@
 using System.Buffers.Binary;
-using System.IO.Hashing;
 
 namespace DeterministicIoPackaging;
 

src/DeterministicIoPackaging/ZipStorer.cs

@@ -25,7 +25,7 @@ public static void RewriteAsStored(MemoryStream source, Stream target)
                 data = ms.ToArray();
             }
 
-            var crc = Crc32(data);
+            var crc = Crc32.HashToUInt32(data);
             var nameBytes = Encoding.UTF8.GetBytes(entry.FullName);
 
             // Local file header
@@ -53,22 +53,22 @@ public static void RewriteAsStored(MemoryStream source, Stream target)
             var nameBytes = Encoding.UTF8.GetBytes(name);
 
             // Central directory header
-            writer.Write(0x02014b50u);       // signature
-            writer.Write((ushort)20);        // version made by
-            writer.Write((ushort)20);        // version needed
-            writer.Write((ushort)0);         // general purpose flags
-            writer.Write((ushort)0);         // compression method: Stored
-            writer.Write(dosTime);           // last mod time
-            writer.Write(dosDate);           // last mod date
-            writer.Write(crc);               // crc-32
+            writer.Write(0x02014b50u);        // signature
+            writer.Write((ushort)20);         // version made by
+            writer.Write((ushort)20);         // version needed
+            writer.Write((ushort)0);          // general purpose flags
+            writer.Write((ushort)0);          // compression method: Stored
+            writer.Write(dosTime);            // last mod time
+            writer.Write(dosDate);            // last mod date
+            writer.Write(crc);                // crc-32
             writer.Write((uint)data.Length);  // compressed size
             writer.Write((uint)data.Length);  // uncompressed size
             writer.Write((ushort)nameBytes.Length); // file name length
-            writer.Write((ushort)0);         // extra field length
-            writer.Write((ushort)0);         // file comment length
-            writer.Write((ushort)0);         // disk number start
-            writer.Write((ushort)0);         // internal file attributes
-            writer.Write(0u);               // external file attributes
+            writer.Write((ushort)0);          // extra field length
+            writer.Write((ushort)0);          // file comment length
+            writer.Write((ushort)0);          // disk number start
+            writer.Write((ushort)0);          // internal file attributes
+            writer.Write(0u);                 // external file attributes
             writer.Write((uint)headerOffset); // relative offset of local header
             writer.Write(nameBytes);
         }
@@ -77,32 +77,17 @@ public static void RewriteAsStored(MemoryStream source, Stream target)
         var centralSize = centralEnd - centralStart;
 
         // End of central directory record
-        writer.Write(0x06054b50u);           // signature
-        writer.Write((ushort)0);             // disk number
-        writer.Write((ushort)0);             // disk with central directory
+        writer.Write(0x06054b50u);            // signature
+        writer.Write((ushort)0);              // disk number
+        writer.Write((ushort)0);              // disk with central directory
         writer.Write((ushort)entries.Count);  // entries on this disk
         writer.Write((ushort)entries.Count);  // total entries
         writer.Write((uint)centralSize);      // central directory size
         writer.Write((uint)centralStart);     // central directory offset
-        writer.Write((ushort)0);             // comment length
+        writer.Write((ushort)0);              // comment length
     }
 
     // DOS date/time for 2020-01-01 00:00:00
     const ushort dosTime = 0;
     const ushort dosDate = (40 << 9) | (1 << 5) | 1; // year=2020-1980=40, month=1, day=1
-
-    static uint Crc32(byte[] data)
-    {
-        var crc = 0xFFFFFFFFu;
-        foreach (var b in data)
-        {
-            crc ^= b;
-            for (var i = 0; i < 8; i++)
-            {
-                crc = (crc >> 1) ^ (0xEDB88320u & ~((crc & 1) - 1));
-            }
-        }
-
-        return ~crc;
-    }
 }

src/Directory.Packages.props

@@ -8,7 +8,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageVersion Include="NUnit" Version="4.5.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
-    <PackageVersion Include="Polyfill" Version="9.17.0" />
+    <PackageVersion Include="Polyfill" Version="9.18.0" />
     <PackageVersion Include="ProjectDefaults" Version="1.0.172" />
     <PackageVersion Include="ProjectFiles" Version="1.0.0" />
     <PackageVersion Include="System.IO.Compression" Version="4.3.0" />