Unify checksum helper methods

Author: YoshiRulz

src/BizHawk.BizInvoke/WaterboxUtils.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Security.Cryptography;
 
 namespace BizHawk.BizInvoke
 {
@@ -22,18 +21,6 @@ public static void CopySome(Stream src, Stream dst, long len)
 			}
 		}
 
-		public static byte[] Hash(byte[] data)
-		{
-			using var h = SHA1.Create();
-			return h.ComputeHash(data);
-		}
-
-		public static byte[] Hash(Stream s)
-		{
-			using var h = SHA1.Create();
-			return h.ComputeHash(s);
-		}
-
 		public static unsafe void ZeroMemory(IntPtr mem, long length)
 		{
 			byte* p = (byte*)mem;

src/BizHawk.Client.Common/Api/Classes/MemoryApi.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography;
 
 using BizHawk.Common;
-using BizHawk.Common.BufferExtensions;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
@@ -235,8 +233,7 @@ public string HashRegion(long addr, int count, string domain = null)
 			}
 			var data = new byte[count];
 			for (var i = 0; i < count; i++) data[i] = d.PeekByte(addr + i);
-			using var hasher = SHA256.Create();
-			return hasher.ComputeHash(data).BytesToHexString();
+			return SHA256Checksum.ComputeDigestHex(data);
 		}
 
 		public uint ReadByte(long addr, string domain = null) => ReadUnsigned(addr, 1, domain);

src/BizHawk.Client.Common/RomLoader.cs

@@ -233,7 +233,7 @@ private GameInfo MakeGameFromDisc(Disc disc, string ext, string name)
 			var discType = new DiscIdentifier(disc).DetectDiscType();
 			var discHasher = new DiscHasher(disc);
 			var discHash = discType == DiscType.SonyPSX
-				? discHasher.Calculate_PSX_BizIDHash().ToString("X8")
+				? discHasher.Calculate_PSX_BizIDHash()
 				: discHasher.OldHash();
 
 			var game = Database.CheckDatabase(discHash);

src/BizHawk.Client.Common/XmlGame.cs

@@ -5,7 +5,6 @@
 using System.Xml;
 
 using BizHawk.Common;
-using BizHawk.Common.BufferExtensions;
 using BizHawk.Common.IOExtensions;
 using BizHawk.Emulation.Common;
 
@@ -99,12 +98,11 @@ public static XmlGame Create(HawkFile f)
 
 						ret.Assets.Add(new KeyValuePair<string, byte[]>(filename, data));
 						ret.AssetFullPaths.Add(fullPath);
-						using var sha1 = System.Security.Cryptography.SHA1.Create();
-						sha1.TransformFinalBlock(data, 0, data.Length);
-						hashStream.Write(sha1.Hash, 0, sha1.Hash.Length);
+						var sha1 = SHA1Checksum.Compute(data);
+						hashStream.Write(sha1, 0, sha1.Length);
 					}
 
-					ret.GI.Hash = hashStream.GetBuffer().HashSHA1(0, (int)hashStream.Length);
+					ret.GI.Hash = SHA1Checksum.ComputeDigestHex(hashStream.GetBufferAsSpan());
 					hashStream.Close();
 					if (originalIndex != null)
 					{

src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs

@@ -1,14 +1,13 @@
 #nullable enable
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Security.Cryptography;
 using System.IO;
 using System.Linq;
 
-using BizHawk.Common.BufferExtensions;
+using BizHawk.Common;
 using BizHawk.Common.CollectionExtensions;
+using BizHawk.Common.IOExtensions;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
@@ -20,9 +19,7 @@ public sealed class FirmwareManager
 		public static (byte[] Patched, string ActualHash) PerformPatchInMemory(byte[] @base, in FirmwarePatchOption patchOption)
 		{
 			var patched = patchOption.Patches.Aggregate(seed: @base, (a, fpd) => fpd.ApplyToMutating(a));
-			using var sha1 = SHA1.Create();
-			sha1.ComputeHash(patched);
-			return (patched, sha1.Hash.BytesToHexString());
+			return (patched, SHA1Checksum.ComputeDigestHex(patched));
 		}
 
 		public static (string FilePath, int FileSize, FirmwareFile FF) PerformPatchOnDisk(string baseFilename, in FirmwarePatchOption patchOption, PathEntryCollection pathEntries)
@@ -95,26 +92,16 @@ public static (string FilePath, int FileSize, FirmwareFile FF) PerformPatchOnDis
 			return resolved.FilePath;
 		}
 
-		private sealed class RealFirmwareReader : IDisposable
+		private sealed class RealFirmwareReader
 		{
 			private readonly Dictionary<string, RealFirmwareFile> _dict = new();
 
-			private SHA1? _sha1 = SHA1.Create();
-
 			public IReadOnlyDictionary<string, RealFirmwareFile> Dict => _dict;
 
-			public void Dispose()
-			{
-				_sha1?.Dispose();
-				_sha1 = null;
-			}
-
 			public RealFirmwareFile Read(FileInfo fi)
 			{
-				if (_sha1 == null) throw new ObjectDisposedException(nameof(RealFirmwareReader));
 				using var fs = fi.OpenRead();
-				_sha1!.ComputeHash(fs);
-				var hash = _sha1.Hash.BytesToHexString();
+				var hash = SHA1Checksum.ComputeDigestHex(fs.ReadAllBytes());
 				return _dict![hash] = new RealFirmwareFile(fi, hash);
 			}
 		}
@@ -133,7 +120,7 @@ public bool CanFileBeImported(string f)
 				if (!_firmwareSizes.Contains(fi.Length)) return false;
 
 				// check the hash
-				using var reader = new RealFirmwareReader();
+				var reader = new RealFirmwareReader();
 				reader.Read(fi);
 				var hash = reader.Dict.Values.First().Hash;
 				return FirmwareDatabase.FirmwareFiles.Any(a => a.Hash == hash);
@@ -146,7 +133,7 @@ public bool CanFileBeImported(string f)
 
 		public void DoScanAndResolve(PathEntryCollection pathEntries, IDictionary<string, string> userSpecifications)
 		{
-			using var reader = new RealFirmwareReader();
+			var reader = new RealFirmwareReader();
 
 			// build a list of files under the global firmwares path, and build a hash for each of them (as ResolutionInfo) while we're at it
 			var todo = new Queue<DirectoryInfo>(new[] { new DirectoryInfo(pathEntries.AbsolutePathFor(pathEntries.FirmwaresPathFragment, null)) });

src/BizHawk.Client.EmuHawk/MainForm.Debug.cs

@@ -5,12 +5,11 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Security.Cryptography;
 using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Client.EmuHawk.Properties;
-using BizHawk.Common.BufferExtensions;
+using BizHawk.Common;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores;
 using BizHawk.Emulation.Cores.Nintendo.GBA;
@@ -88,9 +87,7 @@ public FirmwareAutopatchDebugToolForm()
 							return;
 						}
 						// else something happened, figure out what it was
-						using var sha1 = SHA1.Create();
-						sha1.ComputeHash(@base);
-						var baseHash = sha1.Hash.BytesToHexString();
+						var baseHash = SHA1Checksum.ComputeDigestHex(@base);
 						this.ModalMessageBox(baseHash == fpo.BaseHash
 							? $"patchset declared with target\nSHA1:{fpo.TargetHash}\nbut produced\nSHA1:{actualHash}\n(is the patch wrong, or the hash?)"
 							: $"patchset declared for base\nSHA1:{fpo.BaseHash}\nbut\nSHA1:{baseHash}\nwas provided");

src/BizHawk.Client.EmuHawk/MainForm.cs

@@ -3822,8 +3822,9 @@ private bool LoadRomInternal(string path, LoadRomArgs args, out bool failureIsFr
 							else
 							{
 								xSw.WriteLine(xmlGame.Assets[xg].Key);
-								xSw.WriteLine($"SHA1:{xmlGame.Assets[xg].Value.HashSHA1()}");
-								xSw.WriteLine($"MD5:{xmlGame.Assets[xg].Value.HashMD5()}");
+								var data = xmlGame.Assets[xg].Value;
+								xSw.WriteLine(SHA1Checksum.ComputePrefixedHex(data));
+								xSw.WriteLine(MD5Checksum.ComputePrefixedHex(data));
 								xSw.WriteLine();
 							}
 						}
@@ -3857,7 +3858,7 @@ private bool LoadRomInternal(string path, LoadRomArgs args, out bool failureIsFr
 					var romDetails = Emulator.RomDetails();
 					if (string.IsNullOrWhiteSpace(romDetails) && loader.Rom != null)
 					{
-						_defaultRomDetails = $"{loader.Game.Name}\r\nSHA1:{loader.Rom.RomData.HashSHA1()}\r\nMD5:{loader.Rom.RomData.HashMD5()}\r\n";
+						_defaultRomDetails = $"{loader.Game.Name}\r\n{SHA1Checksum.ComputePrefixedHex(loader.Rom.RomData)}\r\n{MD5Checksum.ComputePrefixedHex(loader.Rom.RomData)}\r\n";
 					}
 					else if (string.IsNullOrWhiteSpace(romDetails) && loader.Rom == null)
 					{

src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs

@@ -5,7 +5,7 @@
 using System.Windows.Forms;
 
 using BizHawk.Client.Common;
-using BizHawk.Common.BufferExtensions;
+using BizHawk.Common;
 using BizHawk.Emulation.Cores.PCEngine;
 using BizHawk.Emulation.Common;
 
@@ -103,7 +103,7 @@ protected override void UpdateAfter()
 				}
 
 				bw.Flush();
-				string md5 = _waveformTemp.HashMD5();
+				var md5 = MD5Checksum.ComputeDigestHex(_waveformTemp);
 
 				if (!_psgEntryTable.TryGetValue(md5, out var entry))
 				{

src/BizHawk.Common/Extensions/BufferExtensions.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Security.Cryptography;
 
 namespace BizHawk.Common.BufferExtensions
 {
@@ -77,30 +76,6 @@ public static bool FindBytes(this byte[] array, byte[] pattern)
 			return result >= pattern.Length - 1;
 		}
 
-		public static string HashMD5(this byte[] data, int offset, int len)
-		{
-			using var md5 = MD5.Create();
-			md5.ComputeHash(data, offset, len);
-			return md5.Hash.BytesToHexString();
-		}
-
-		public static string HashMD5(this byte[] data)
-		{
-			return HashMD5(data, 0, data.Length);
-		}
-
-		public static string HashSHA1(this byte[] data, int offset, int len)
-		{
-			using var sha1 = SHA1.Create();
-			sha1.ComputeHash(data, offset, len);
-			return sha1.Hash.BytesToHexString();
-		}
-
-		public static string HashSHA1(this byte[] data)
-		{
-			return HashSHA1(data, 0, data.Length);
-		}
-
 		private static int Hex2Int(char c)
 		{
 			if (c <= '9')

src/BizHawk.Common/Extensions/IOExtensions.cs

@@ -1,10 +1,14 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Text;
 
 namespace BizHawk.Common.IOExtensions
 {
 	public static class IOExtensions
 	{
+		public static Span<byte> GetBufferAsSpan(this MemoryStream ms)
+			=> ms.GetBuffer().AsSpan().Slice(start: 0, length: (int) ms.Length);
+
 		public static byte[] ReadAllBytes(this Stream stream)
 		{
 			const int BUFF_SIZE = 4096;