refactor: CryptoArrayPool and CryptoBuffer

Author: HMBSbige

src/CryptoBase/CryptoArrayPool.cs

@@ -4,15 +4,15 @@ public sealed class CryptoArrayPool<T>(int length) : IDisposable where T : struc
 {
 	public readonly T[] Array = ArrayPool<T>.Shared.Rent(length);
 
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
-	public Span<T> GetSpan()
+	public Span<T> Span
 	{
-		return Array.AsSpan(0, length);
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		get => Array.AsSpan(0, length);
 	}
 
 	public void Dispose()
 	{
-		CryptographicOperations.ZeroMemory(MemoryMarshal.AsBytes(GetSpan()));
+		CryptographicOperations.ZeroMemory(MemoryMarshal.AsBytes(Span));
 		ArrayPool<T>.Shared.Return(Array);
 	}
 }

src/CryptoBase/CryptoBuffer.cs

@@ -1,29 +1,29 @@
 namespace CryptoBase;
 
-public readonly ref struct CryptoBuffer : IDisposable
+public readonly ref struct CryptoBuffer<T> : IDisposable where T : struct
 {
-	private readonly byte[]? _buffer;
+	private readonly T[]? _buffer;
 
-	public Span<byte> Span { get; }
+	public Span<T> Span { get; }
 
 	public CryptoBuffer(int length)
 	{
-		_buffer = ArrayPool<byte>.Shared.Rent(length);
+		_buffer = ArrayPool<T>.Shared.Rent(length);
 		Span = _buffer.AsSpan(0, length);
 	}
 
-	public CryptoBuffer(Span<byte> buffer)
+	public CryptoBuffer(Span<T> buffer)
 	{
 		Span = buffer;
 	}
 
 	public void Dispose()
 	{
-		CryptographicOperations.ZeroMemory(Span);
+		CryptographicOperations.ZeroMemory(MemoryMarshal.AsBytes(Span));
 
 		if (_buffer is not null)
 		{
-			ArrayPool<byte>.Shared.Return(_buffer);
+			ArrayPool<T>.Shared.Return(_buffer);
 		}
 	}
 }

src/CryptoBase/KDF/Hkdf.cs

@@ -120,7 +120,7 @@ public static void DeriveKey(DigestType type, ReadOnlySpan<byte> ikm, Span<byte>
 
 	private static void DeriveKeyInternal(DigestType type, int hashLength, ReadOnlySpan<byte> ikm, Span<byte> output, ReadOnlySpan<byte> salt, ReadOnlySpan<byte> info)
 	{
-		using CryptoBuffer buffer = new(stackalloc byte[hashLength]);
+		using CryptoBuffer<byte> buffer = new(stackalloc byte[hashLength]);
 		Span<byte> prk = buffer.Span;
 
 		ExtractInternal(type, ikm, salt, prk);

src/CryptoBase/SymmetricCryptos/BlockCryptoModes/Xts/XtsMode.cs

@@ -25,15 +25,15 @@ public void Encrypt(ReadOnlySpan<byte> iv, ReadOnlySpan<byte> source, Span<byte>
 		ArgumentOutOfRangeException.ThrowIfLessThan(source.Length, BlockSize, nameof(source));
 		ArgumentOutOfRangeException.ThrowIfLessThan(destination.Length, source.Length, nameof(destination));
 
-		using CryptoBuffer cryptoBuffer = new(stackalloc byte[BlockSize]);
+		using CryptoBuffer<byte> cryptoBuffer = new(stackalloc byte[BlockSize]);
 		Span<byte> tweak = cryptoBuffer.Span;
 		_tweakCrypto.Encrypt(iv, tweak);
 		IBlockCrypto crypto = _dataCrypto;
 
 		int left = source.Length % BlockSize;
 		int size = source.Length - left;
 
-		using (CryptoBuffer buffer = new(size))
+		using (CryptoBuffer<byte> buffer = new(size))
 		{
 			Span<byte> tweakBuffer = buffer.Span;
 
@@ -74,15 +74,15 @@ public void Decrypt(ReadOnlySpan<byte> iv, ReadOnlySpan<byte> source, Span<byte>
 		ArgumentOutOfRangeException.ThrowIfLessThan(source.Length, BlockSize, nameof(source));
 		ArgumentOutOfRangeException.ThrowIfLessThan(destination.Length, source.Length, nameof(destination));
 
-		using CryptoBuffer cryptoBuffer = new(stackalloc byte[BlockSize]);
+		using CryptoBuffer<byte> cryptoBuffer = new(stackalloc byte[BlockSize]);
 		Span<byte> tweak = cryptoBuffer.Span;
 		_tweakCrypto.Encrypt(iv, tweak);
 		IBlockCrypto crypto = _dataCrypto;
 
 		int left = source.Length % BlockSize;
 		int size = source.Length - left - (BlockSize & (left | -left) >> 31);
 
-		using (CryptoBuffer buffer = new(size))
+		using (CryptoBuffer<byte> buffer = new(size))
 		{
 			Span<byte> tweakBuffer = buffer.Span;
 
@@ -105,7 +105,7 @@ public void Decrypt(ReadOnlySpan<byte> iv, ReadOnlySpan<byte> source, Span<byte>
 
 		if (left is not 0)
 		{
-			using CryptoBuffer buffer = new(stackalloc byte[BlockSize]);
+			using CryptoBuffer<byte> buffer = new(stackalloc byte[BlockSize]);
 			Span<byte> finalTweak = buffer.Span;
 			tweak.CopyTo(finalTweak);
 			Gf128Mul(ref finalTweak);