IT.Hashing.Gost 2.0

Ivan Tikhonov · Ivan Tikhonov · commit 95bc7deec52d · 2026-01-30T16:30:10.000+03:00
diff --git a/IT.Hashing.Gost/GOST3411_2012Digest.cs b/IT.Hashing.Gost/GOST3411_2012Digest.cs
@@ -56,7 +56,6 @@ public virtual int DoFinal(byte[] output, int outOff)
         return 64;
     }
 
-#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
     public virtual int DoFinal(Span<byte> output)
     {
         int lenM = 64 - bOff;
@@ -87,7 +86,6 @@ public virtual int DoFinal(Span<byte> output)
         Reset();
         return 64;
     }
-#endif
 
     public int GetByteLength()
     {
@@ -96,7 +94,6 @@ public int GetByteLength()
 
     public abstract int GetDigestSize();
 
-
     public void Reset()
     {
         bOff = 64;
@@ -143,32 +140,29 @@ public void BlockUpdate(byte[] input, int inOff, int len)
         }
     }
 
-#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
     public void BlockUpdate(ReadOnlySpan<byte> input)
     {
         while (bOff != 64 && input.Length > 0)
         {
             Update(input[0]);
-            input = input[1..];
+            input = input.Slice(1);
         }
         while (input.Length >= 64)
         {
-            input[..64].CopyTo(tmp.AsSpan());
+            input.Slice(0, 64).CopyTo(tmp.AsSpan());
             reverse(tmp, block);
             g_N(h, N, block);
             addMod512(N, 512);
             addMod512(Sigma, block);
 
-            input = input[64..];
+            input = input.Slice(64);
         }
         while (input.Length > 0)
         {
             Update(input[0]);
-            input = input[1..];
+            input = input.Slice(1);
         }
     }
-#endif
-
     private static void Fill(
         byte[] buf,
         byte b)
diff --git a/IT.Hashing.Gost/GOST3411_2012_256Digest.cs b/IT.Hashing.Gost/GOST3411_2012_256Digest.cs
@@ -40,15 +40,13 @@ public override int DoFinal(byte[] output, int outOff)
         return 32;
     }
 
-#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
     public override int DoFinal(Span<byte> output)
     {
         Span<byte> result = stackalloc byte[64];
         base.DoFinal(result);
 
-        result[32..].CopyTo(output);
+        result.Slice(32).CopyTo(output);
 
         return 32;
     }
-#endif
 }
diff --git a/IT.Hashing.Gost/IT.Hashing.Gost.csproj b/IT.Hashing.Gost/IT.Hashing.Gost.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
 	<LangVersion>latest</LangVersion>
 	<Nullable>enable</Nullable>
 	<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -13,7 +13,7 @@
 	<PublishRepositoryUrl>true</PublishRepositoryUrl>
 	<Authors>Ivan Tikhonov</Authors>
 	<Copyright>Ivan Tikhonov © 2023</Copyright>
-	<Version>2.0.0-pre1</Version>
+	<Version>2.0.0</Version>
 	<PackageTags>Gost Hashing Managed</PackageTags>
 	<PackageReadmeFile>Readme.md</PackageReadmeFile>
 	<PackageIcon>Icon.png</PackageIcon>
@@ -32,8 +32,12 @@
     <None Include="..\Icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
+    <PackageReference Include="System.Memory" Version="4.6.3" />
+  </ItemGroup>
+	
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.102" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public virtual int DoFinal(byte[] output, int outOff)`
`56`	`56`	`return 64;`
`57`	`57`	`}`
`58`	`58`
`59`		`-#if NETCOREAPP2_1_OR_GREATER \|\| NETSTANDARD2_1_OR_GREATER`
`60`	`59`	`public virtual int DoFinal(Span<byte> output)`
`61`	`60`	`{`
`62`	`61`	`int lenM = 64 - bOff;`
`@@ -87,7 +86,6 @@ public virtual int DoFinal(Span<byte> output)`
`87`	`86`	`Reset();`
`88`	`87`	`return 64;`
`89`	`88`	`}`
`90`		`-#endif`
`91`	`89`
`92`	`90`	`public int GetByteLength()`
`93`	`91`	`{`
`@@ -96,7 +94,6 @@ public int GetByteLength()`
`96`	`94`
`97`	`95`	`public abstract int GetDigestSize();`
`98`	`96`
`99`		`-`
`100`	`97`	`public void Reset()`
`101`	`98`	`{`
`102`	`99`	`bOff = 64;`
`@@ -143,32 +140,29 @@ public void BlockUpdate(byte[] input, int inOff, int len)`
`143`	`140`	`}`
`144`	`141`	`}`
`145`	`142`
`146`		`-#if NETCOREAPP2_1_OR_GREATER \|\| NETSTANDARD2_1_OR_GREATER`
`147`	`143`	`public void BlockUpdate(ReadOnlySpan<byte> input)`
`148`	`144`	`{`
`149`	`145`	`while (bOff != 64 && input.Length > 0)`
`150`	`146`	`{`
`151`	`147`	`Update(input[0]);`
`152`		`- input = input[1..];`
	`148`	`+ input = input.Slice(1);`
`153`	`149`	`}`
`154`	`150`	`while (input.Length >= 64)`
`155`	`151`	`{`
`156`		`- input[..64].CopyTo(tmp.AsSpan());`
	`152`	`+ input.Slice(0, 64).CopyTo(tmp.AsSpan());`
`157`	`153`	`reverse(tmp, block);`
`158`	`154`	`g_N(h, N, block);`
`159`	`155`	`addMod512(N, 512);`
`160`	`156`	`addMod512(Sigma, block);`
`161`	`157`
`162`		`- input = input[64..];`
	`158`	`+ input = input.Slice(64);`
`163`	`159`	`}`
`164`	`160`	`while (input.Length > 0)`
`165`	`161`	`{`
`166`	`162`	`Update(input[0]);`
`167`		`- input = input[1..];`
	`163`	`+ input = input.Slice(1);`
`168`	`164`	`}`
`169`	`165`	`}`
`170`		`-#endif`
`171`		`-`
`172`	`166`	`private static void Fill(`
`173`	`167`	`byte[] buf,`
`174`	`168`	`byte b)`
Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,13 @@ public override int DoFinal(byte[] output, int outOff)`
`40`	`40`	`return 32;`
`41`	`41`	`}`
`42`	`42`
`43`		`-#if NETCOREAPP2_1_OR_GREATER \|\| NETSTANDARD2_1_OR_GREATER`
`44`	`43`	`public override int DoFinal(Span<byte> output)`
`45`	`44`	`{`
`46`	`45`	`Span<byte> result = stackalloc byte[64];`
`47`	`46`	`base.DoFinal(result);`
`48`	`47`
`49`		`- result[32..].CopyTo(output);`
	`48`	`+ result.Slice(32).CopyTo(output);`
`50`	`49`
`51`	`50`	`return 32;`
`52`	`51`	`}`
`53`		`-#endif`
`54`	`52`	`}`