small updates

Author: saucecontrol

src/Blake2.sln

@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blake2.Bench", "..\tests\Bl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blake2.Test", "..\tests\Blake2.Test\Blake2.Test.csproj", "{791618B6-C4AC-4859-8259-589416D0864A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blake2Fast", "Blake2Fast\Blake2Fast.csproj", "{D9ABAAEA-7766-497A-88F5-92FF501B51EC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blake2Fast", "Blake2Fast\Blake2Fast.csproj", "{D9ABAAEA-7766-497A-88F5-92FF501B51EC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Blake2Fast/Blake2Fast.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<VersionPrefix>0.3.0</VersionPrefix>
-		<TargetFrameworks>netstandard1.1;netstandard1.3;netcoreapp2.1;netcoreapp3.0;net45</TargetFrameworks>
+		<TargetFrameworks>netstandard1.1;netstandard1.3;netstandard2.0;netcoreapp2.1;netcoreapp3.0;net45</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -17,10 +17,10 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="!$(DefineConstants.Contains('FAST_SPAN'))">
-		<PackageReference Include="System.Memory" Version="4.5.2" />
+		<PackageReference Include="System.Memory" Version="4.5.3" />
 	</ItemGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)'!='netcoreapp3.0'">
 		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
 	</ItemGroup>
 

src/Blake2Fast/HashAlgorithm.cs

@@ -17,7 +17,7 @@ internal sealed class Blake2HMAC : HMAC
 		public sealed override int HashSize => HashSizeValue;
 #endif
 
-		private Blake2Algorithm alg;
+		private readonly Blake2Algorithm alg;
 		private IBlake2Incremental impl;
 
 		public Blake2HMAC(Blake2Algorithm hashAlg, int hashBytes, ReadOnlySpan<byte> key)

src/Directory.Build.props

@@ -8,6 +8,7 @@
 		<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<Copyright>Copyright © 2018-$([System.DateTime]::Today.Year) $(Authors)</Copyright>
+		<Title>High-Performance BLAKE2 Hashing for .NET</Title>
 		<Description>High-Performance BLAKE2 Hashing for .NET</Description>
 		<PackageReleaseNotes>See $(RepositoryUrl)/releases for release-specific notes.</PackageReleaseNotes>
 
@@ -41,7 +42,7 @@
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(Configuration)'=='Release'">
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all"/>
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="all"/>
 	</ItemGroup>
 
 </Project>

tests/Blake2.Test/RfcSelfTest.cs

@@ -4,11 +4,6 @@
 using Xunit;
 using SauceControl.Blake2Fast;
 
-internal static class ArrayExtension
-{
-	public static ArraySegment<T> Slice<T>(this T[] a, int start, int count) => new ArraySegment<T>(a, start, count);
-}
-
 public class RfcSelfTest
 {
 	private static readonly byte[] blake2bCheck = new byte[] {
@@ -128,26 +123,28 @@ private static bool blake2bHmacSelfTest()
 
 		foreach (int diglen in new[] { 20, 32, 48, 64 })
 		{
-			var halg = Blake2b.CreateHashAlgorithm(diglen);
-			var hmac = Blake2b.CreateHMAC(diglen, getTestSequence(diglen));
-
-			foreach (int msglen in new[] { 0, 3, 128, 129, 255, 1024 })
+			using (var halg = Blake2b.CreateHashAlgorithm(diglen))
+			using (var hmac = Blake2b.CreateHMAC(diglen, getTestSequence(diglen)))
 			{
-				var msg = getTestSequence(msglen);
+				foreach (int msglen in new[] { 0, 3, 128, 129, 255, 1024 })
+				{
+					var msg = getTestSequence(msglen);
 
 #if ICRYPTOTRANSFORM
-				inc.TransformBlock(halg.ComputeHash(msg), 0, diglen, null, 0);
-				inc.TransformBlock(hmac.ComputeHash(msg), 0, diglen, null, 0);
+					inc.TransformBlock(halg.ComputeHash(msg), 0, diglen, null, 0);
+					inc.TransformBlock(hmac.ComputeHash(msg), 0, diglen, null, 0);
 #else
-				inc.Update(halg.ComputeHash(msg));
-				inc.Update(hmac.ComputeHash(msg));
+					inc.Update(halg.ComputeHash(msg));
+					inc.Update(hmac.ComputeHash(msg));
 #endif
+				}
 			}
 		}
 
 #if ICRYPTOTRANSFORM
 		inc.TransformFinalBlock(Array.Empty<byte>(), 0, 0);
 		var hash = inc.Hash;
+		inc.Dispose();
 #else
 		var hash = inc.Finish();
 #endif
@@ -165,26 +162,28 @@ private static bool blake2sHmacSelfTest()
 
 		foreach (int diglen in new[] { 16, 20, 28, 32 })
 		{
-			var halg = Blake2s.CreateHashAlgorithm(diglen);
-			var hmac = Blake2s.CreateHMAC(diglen, getTestSequence(diglen));
-
-			foreach (int msglen in new[] { 0, 3, 64, 65, 255, 1024 })
+			using (var halg = Blake2s.CreateHashAlgorithm(diglen))
+			using (var hmac = Blake2s.CreateHMAC(diglen, getTestSequence(diglen)))
 			{
-				var msg = getTestSequence(msglen);
+				foreach (int msglen in new[] { 0, 3, 64, 65, 255, 1024 })
+				{
+					var msg = getTestSequence(msglen);
 
 #if ICRYPTOTRANSFORM
-				inc.TransformBlock(halg.ComputeHash(msg), 0, diglen, null, 0);
-				inc.TransformBlock(hmac.ComputeHash(msg), 0, diglen, null, 0);
+					inc.TransformBlock(halg.ComputeHash(msg), 0, diglen, null, 0);
+					inc.TransformBlock(hmac.ComputeHash(msg), 0, diglen, null, 0);
 #else
-				inc.Update(halg.ComputeHash(msg));
-				inc.Update(hmac.ComputeHash(msg));
+					inc.Update(halg.ComputeHash(msg));
+					inc.Update(hmac.ComputeHash(msg));
 #endif
+				}
 			}
 		}
 
 #if ICRYPTOTRANSFORM
 		inc.TransformFinalBlock(Array.Empty<byte>(), 0, 0);
 		var hash = inc.Hash;
+		inc.Dispose();
 #else
 		var hash = inc.Finish();
 #endif