refactor: IBlockCrypto

HMBSbige · HMBSbige · commit a4c6277f22b4 · 2025-10-28T18:20:05.000+08:00
diff --git a/src/CryptoBase.Abstractions/SymmetricCryptos/BlockCryptoBase.cs b/src/CryptoBase.Abstractions/SymmetricCryptos/BlockCryptoBase.cs
@@ -18,8 +18,6 @@ public virtual void Decrypt(ReadOnlySpan<byte> source, Span<byte> destination)
 		ArgumentOutOfRangeException.ThrowIfLessThan(destination.Length, source.Length, nameof(destination));
 	}
 
-	public virtual void Reset() { }
-
 	public virtual void Dispose()
 	{
 		GC.SuppressFinalize(this);
diff --git a/src/CryptoBase.Abstractions/SymmetricCryptos/IBlockCrypto.cs b/src/CryptoBase.Abstractions/SymmetricCryptos/IBlockCrypto.cs
@@ -1,6 +1,6 @@
 namespace CryptoBase.Abstractions.SymmetricCryptos;
 
-public interface IBlockCrypto : ISymmetricCrypto, ICanReset
+public interface IBlockCrypto : ISymmetricCrypto
 {
 	/// <summary>
 	/// 块大小，单位字节
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CBCBlockMode.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CBCBlockMode.cs
@@ -29,6 +29,7 @@ public CBCBlockMode(IBlockCrypto crypto, ReadOnlySpan<byte> iv)
 	public override void Encrypt(ReadOnlySpan<byte> source, Span<byte> destination)
 	{
 		base.Encrypt(source, destination);
+		Reset();
 
 		FastUtils.Xor(_block, source, destination, BlockSize);
 
@@ -40,6 +41,7 @@ public override void Encrypt(ReadOnlySpan<byte> source, Span<byte> destination)
 	public override void Decrypt(ReadOnlySpan<byte> source, Span<byte> destination)
 	{
 		base.Decrypt(source, destination);
+		Reset();
 
 		_internalBlockCrypto.Decrypt(source, destination);
 
@@ -48,11 +50,9 @@ public override void Decrypt(ReadOnlySpan<byte> source, Span<byte> destination)
 		source.Slice(0, BlockSize).CopyTo(_block);
 	}
 
-	public override void Reset()
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	private void Reset()
 	{
-		base.Reset();
-		_internalBlockCrypto.Reset();
-
 		_iv.Span.CopyTo(_block);
 	}
 
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CFB128StreamMode.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CFB128StreamMode.cs
@@ -81,7 +81,6 @@ public void Update(ReadOnlySpan<byte> source, Span<byte> destination)
 
 	public void Reset()
 	{
-		_internalBlockCrypto.Reset();
 		_index = 0;
 
 		_iv.CopyTo(_block);
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamMode.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamMode.cs
@@ -86,7 +86,6 @@ private void UpdateCore(ReadOnlySpan<byte> source, Span<byte> destination)
 
 	public void Reset()
 	{
-		_internalBlockCrypto.Reset();
 		_index = 0;
 
 		Span<byte> c = _counter.AsSpan(0, BlockSize);
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock16X86.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock16X86.cs
@@ -108,7 +108,6 @@ private void UpdateKeyStream()
 
 	public void Reset()
 	{
-		_internalBlockCrypto.Reset();
 		_index = 0;
 		_counterV0 = _iCounter;
 		_counterV1 = _counterV0.AddTwo128Le();
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock4X86.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock4X86.cs
@@ -95,7 +95,6 @@ private void UpdateKeyStream()
 
 	public void Reset()
 	{
-		_internalBlockCrypto.Reset();
 		_index = 0;
 		_counterV0 = _iCounter;
 		_counterV1 = _counterV0.Inc128Le();
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock8AvxX86.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock8AvxX86.cs
@@ -93,7 +93,6 @@ private void UpdateKeyStream()
 
 	public void Reset()
 	{
-		_internalBlockCrypto.Reset();
 		_index = 0;
 		_counterV0 = _iCounter;
 		_counterV1 = _counterV0.AddTwo128Le();
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock8X86.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock8X86.cs
@@ -109,7 +109,6 @@ private void UpdateKeyStream()
 
 	public void Reset()
 	{
-		_internalBlockCrypto.Reset();
 		_index = 0;
 		_counterV0 = _iCounter;
 		_counterV1 = _counterV0.Inc128Le();
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeX86.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeX86.cs
@@ -79,7 +79,6 @@ public void Update(ReadOnlySpan<byte> source, Span<byte> destination)
 
 	public void Reset()
 	{
-		_internalBlockCrypto.Reset();
 		_index = 0;
 		_counterV = _iCounter;
 	}
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/Xts/XtsMode.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/Xts/XtsMode.cs
@@ -144,12 +144,6 @@ private static void Gf128Mul(ref Span<byte> buffer)
 		v0 = v0 << 1 ^ t;
 	}
 
-	public override void Reset()
-	{
-		_dataCrypto.Reset();
-		_tweakCrypto.Reset();
-	}
-
 	public override void Dispose()
 	{
 		_dataCrypto.Dispose();
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptos/AES/DefaultAESCrypto.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptos/AES/DefaultAESCrypto.cs
@@ -5,6 +5,7 @@ namespace CryptoBase.SymmetricCryptos.BlockCryptos.AES;
 public abstract class DefaultAESCrypto : AESCrypto
 {
 	protected abstract ICryptoTransform Encryptor { get; }
+
 	protected abstract ICryptoTransform Decryptor { get; }
 
 	private readonly byte[] _buffer;
@@ -20,7 +21,7 @@ public override void Encrypt(ReadOnlySpan<byte> source, Span<byte> destination)
 	{
 		base.Encrypt(source, destination);
 
-		source[..BlockSize].CopyTo(_buffer);
+		source.Slice(0, BlockSize).CopyTo(_buffer);
 		Encryptor.TransformBlock(_buffer, 0, BlockSize, _outBuffer, 0);
 		_outBuffer.CopyTo(destination);
 	}
@@ -29,19 +30,11 @@ public override void Decrypt(ReadOnlySpan<byte> source, Span<byte> destination)
 	{
 		base.Decrypt(source, destination);
 
-		source[..BlockSize].CopyTo(_buffer);
+		source.Slice(0, BlockSize).CopyTo(_buffer);
 		Decryptor.TransformBlock(_buffer, 0, BlockSize, _outBuffer, 0);
 		_outBuffer.CopyTo(destination);
 	}
 
-	public override void Reset()
-	{
-		base.Reset();
-
-		Encryptor.TransformFinalBlock([], 0, 0);
-		Decryptor.TransformFinalBlock([], 0, 0);
-	}
-
 	public override void Dispose()
 	{
 		base.Dispose();
@@ -51,5 +44,7 @@ public override void Dispose()
 
 		ArrayPool<byte>.Shared.Return(_buffer);
 		ArrayPool<byte>.Shared.Return(_outBuffer);
+
+		GC.SuppressFinalize(this);
 	}
 }
diff --git a/test/CryptoBase.Tests/AESCBCTest.cs b/test/CryptoBase.Tests/AESCBCTest.cs
@@ -7,38 +7,24 @@ namespace CryptoBase.Tests;
 
 public class AESCBCTest
 {
-	private static void Test_Internal(IBlockCrypto crypto, string hex1, string hex2)
+	private static void Test_Internal(IBlockCrypto crypto, ReadOnlySpan<byte> plain, ReadOnlySpan<byte> ciper)
 	{
 		Assert.Equal(@"AES-CBC", crypto.Name);
 		Assert.Equal(16, crypto.BlockSize);
 
-		Span<byte> h1 = hex1.FromHex();
-		Span<byte> h2 = hex2.FromHex();
-		Span<byte> o1 = stackalloc byte[crypto.BlockSize];
+		Span<byte> o = stackalloc byte[ciper.Length];
 
-		crypto.Encrypt(h1, o1);
-		Assert.True(o1.SequenceEqual(h2));
+		crypto.Encrypt(plain, o);
+		Assert.True(o.SequenceEqual(ciper));
 
-		crypto.Reset();
-
-		crypto.Encrypt(h1, o1);
-		Assert.True(o1.SequenceEqual(h2));
-
-		crypto.Reset();
-
-		crypto.Decrypt(h2, o1);
-		Assert.True(o1.SequenceEqual(h1));
-
-		crypto.Reset();
-
-		crypto.Decrypt(h2, o1);
-		Assert.True(o1.SequenceEqual(h1));
+		crypto.Decrypt(ciper, o);
+		Assert.True(o.SequenceEqual(plain));
 
 		crypto.Dispose();
 	}
 
 	/// <summary>
-	/// https://gchq.github.io/CyberChef/#recipe=AES_Encrypt(%7B'option':'Hex','string':''%7D,%7B'option':'Hex','string':''%7D,'CBC','Hex','Hex','')
+	/// https://gchq.github.io/CyberChef/#recipe=AES_Encrypt(%7B'option':'Hex','string':''%7D,%7B'option':'Hex','string':''%7D,'CBC/NoPadding','Hex','Hex',%7B'option':'Hex','string':''%7D)
 	/// </summary>
 	[Theory]
 	[InlineData(@"000102030405060708090a0b0c0d0e0f",
@@ -55,9 +41,12 @@ private static void Test_Internal(IBlockCrypto crypto, string hex1, string hex2)
 		@"93010f33350c4e774778bea533e18cf2")]
 	public void Test(string keyHex, string ivHex, string hex1, string hex2)
 	{
-		byte[] key = keyHex.FromHex();
-		byte[] iv = ivHex.FromHex();
-		Test_Internal(new AESCBCCrypto(key, iv), hex1, hex2);
-		Test_Internal(new CBCBlockMode(AESUtils.CreateECB(key), iv), hex1, hex2);
+		ReadOnlySpan<byte> key = keyHex.FromHex();
+		ReadOnlySpan<byte> iv = ivHex.FromHex();
+		ReadOnlySpan<byte> plain = hex1.FromHex();
+		ReadOnlySpan<byte> cipher = hex2.FromHex();
+
+		Test_Internal(new AESCBCCrypto(key, iv), plain, cipher);
+		Test_Internal(new CBCBlockMode(AESUtils.CreateECB(key), iv), plain, cipher);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ public virtual void Decrypt(ReadOnlySpan<byte> source, Span<byte> destination)`
`18`	`18`	`ArgumentOutOfRangeException.ThrowIfLessThan(destination.Length, source.Length, nameof(destination));`
`19`	`19`	`}`
`20`	`20`
`21`		`- public virtual void Reset() { }`
`22`		`-`
`23`	`21`	`public virtual void Dispose()`
`24`	`22`	`{`
`25`	`23`	`GC.SuppressFinalize(this);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace CryptoBase.Abstractions.SymmetricCryptos;`
`2`	`2`
`3`		`-public interface IBlockCrypto : ISymmetricCrypto, ICanReset`
	`3`	`+public interface IBlockCrypto : ISymmetricCrypto`
`4`	`4`	`{`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// 块大小，单位字节`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public CBCBlockMode(IBlockCrypto crypto, ReadOnlySpan<byte> iv)`
`29`	`29`	`public override void Encrypt(ReadOnlySpan<byte> source, Span<byte> destination)`
`30`	`30`	`{`
`31`	`31`	`base.Encrypt(source, destination);`
	`32`	`+ Reset();`
`32`	`33`
`33`	`34`	`FastUtils.Xor(_block, source, destination, BlockSize);`
`34`	`35`
`@@ -40,6 +41,7 @@ public override void Encrypt(ReadOnlySpan<byte> source, Span<byte> destination)`
`40`	`41`	`public override void Decrypt(ReadOnlySpan<byte> source, Span<byte> destination)`
`41`	`42`	`{`
`42`	`43`	`base.Decrypt(source, destination);`
	`44`	`+ Reset();`
`43`	`45`
`44`	`46`	`_internalBlockCrypto.Decrypt(source, destination);`
`45`	`47`
`@@ -48,11 +50,9 @@ public override void Decrypt(ReadOnlySpan<byte> source, Span<byte> destination)`
`48`	`50`	`source.Slice(0, BlockSize).CopyTo(_block);`
`49`	`51`	`}`
`50`	`52`
`51`		`- public override void Reset()`
	`53`	`+ [MethodImpl(MethodImplOptions.AggressiveInlining)]`
	`54`	`+ private void Reset()`
`52`	`55`	`{`
`53`		`- base.Reset();`
`54`		`- _internalBlockCrypto.Reset();`
`55`		`-`
`56`	`56`	`_iv.Span.CopyTo(_block);`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ public void Update(ReadOnlySpan<byte> source, Span<byte> destination)`
`81`	`81`
`82`	`82`	`public void Reset()`
`83`	`83`	`{`
`84`		`- _internalBlockCrypto.Reset();`
`85`	`84`	`_index = 0;`
`86`	`85`
`87`	`86`	`_iv.CopyTo(_block);`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ private void UpdateCore(ReadOnlySpan<byte> source, Span<byte> destination)`
`86`	`86`
`87`	`87`	`public void Reset()`
`88`	`88`	`{`
`89`		`- _internalBlockCrypto.Reset();`
`90`	`89`	`_index = 0;`
`91`	`90`
`92`	`91`	`Span<byte> c = _counter.AsSpan(0, BlockSize);`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,6 @@ private void UpdateKeyStream()`
`108`	`108`
`109`	`109`	`public void Reset()`
`110`	`110`	`{`
`111`		`- _internalBlockCrypto.Reset();`
`112`	`111`	`_index = 0;`
`113`	`112`	`_counterV0 = _iCounter;`
`114`	`113`	`_counterV1 = _counterV0.AddTwo128Le();`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@ private void UpdateKeyStream()`
`95`	`95`
`96`	`96`	`public void Reset()`
`97`	`97`	`{`
`98`		`- _internalBlockCrypto.Reset();`
`99`	`98`	`_index = 0;`
`100`	`99`	`_counterV0 = _iCounter;`
`101`	`100`	`_counterV1 = _counterV0.Inc128Le();`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,6 @@ private void UpdateKeyStream()`
`93`	`93`
`94`	`94`	`public void Reset()`
`95`	`95`	`{`
`96`		`- _internalBlockCrypto.Reset();`
`97`	`96`	`_index = 0;`
`98`	`97`	`_counterV0 = _iCounter;`
`99`	`98`	`_counterV1 = _counterV0.AddTwo128Le();`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ private void UpdateKeyStream()`
`109`	`109`
`110`	`110`	`public void Reset()`
`111`	`111`	`{`
`112`		`- _internalBlockCrypto.Reset();`
`113`	`112`	`_index = 0;`
`114`	`113`	`_counterV0 = _iCounter;`
`115`	`114`	`_counterV1 = _counterV0.Inc128Le();`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ public void Update(ReadOnlySpan<byte> source, Span<byte> destination)`
`79`	`79`
`80`	`80`	`public void Reset()`
`81`	`81`	`{`
`82`		`- _internalBlockCrypto.Reset();`
`83`	`82`	`_index = 0;`
`84`	`83`	`_counterV = _iCounter;`
`85`	`84`	`}`