Apply scoped to some instances of Span<T>/ReadOnlySpan<T>.

tera-arise · Aug 26, 2023 · 5d7e27e · 5d7e27e
1 parent 2fbb555
commit 5d7e27e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/src/server/web/Cryptography/PasswordStrategy.cs b/src/server/web/Cryptography/PasswordStrategy.cs
@@ -32,5 +32,5 @@ public static bool IsPasswordValid(string password)
 
     public abstract byte[] GenerateSalt();
 
-    public abstract byte[] CalculateHash(ReadOnlySpan<char> password, ReadOnlySpan<byte> salt);
+    public abstract byte[] CalculateHash(scoped ReadOnlySpan<char> password, ReadOnlySpan<byte> salt);
 }
diff --git a/src/server/web/Cryptography/Pbkdf2PasswordStrategy.cs b/src/server/web/Cryptography/Pbkdf2PasswordStrategy.cs
@@ -17,7 +17,7 @@ public override byte[] GenerateSalt()
         return RandomNumberGenerator.GetBytes(Length);
     }
 
-    public override byte[] CalculateHash(ReadOnlySpan<char> password, ReadOnlySpan<byte> salt)
+    public override byte[] CalculateHash(scoped ReadOnlySpan<char> password, ReadOnlySpan<byte> salt)
     {
         // https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#pbkdf2
         return Rfc2898DeriveBytes.Pbkdf2(password, salt, 210_000, HashAlgorithmName.SHA512, Length);

diff --git a/src/shared/common/IO/StreamAccessor.cs b/src/shared/common/IO/StreamAccessor.cs
@@ -21,12 +21,12 @@ public StreamAccessor(Stream stream)
         Stream = stream;
     }
 
-    public void Read(Span<byte> buffer)
+    public void Read(scoped Span<byte> buffer)
     {
         Stream.ReadExactly(buffer);
     }
 
-    public void Write(ReadOnlySpan<byte> buffer)
+    public void Write(scoped ReadOnlySpan<byte> buffer)
     {
         Stream.Write(buffer);
     }

diff --git a/src/shared/core/Bridge/BridgeDataComponent.cs b/src/shared/core/Bridge/BridgeDataComponent.cs
@@ -19,7 +19,7 @@ protected BridgeDataComponent()
         IV = iv;
     }
 
-    protected abstract void InitializeKey(Span<byte> key);
+    protected abstract void InitializeKey(scoped Span<byte> key);
 
-    protected abstract void InitializeIV(Span<byte> iv);
+    protected abstract void InitializeIV(scoped Span<byte> iv);
 }
diff --git a/src/shared/core/Net/GameConnectionConduit.cs b/src/shared/core/Net/GameConnectionConduit.cs
@@ -75,22 +75,22 @@ public bool TryPostPacket(GamePacket packet)
         return TryWritePacket(packet, completion: null);
     }
 
-    public void PostPacket(TeraGamePacketCode code, ReadOnlySpan<byte> payload)
+    public void PostPacket(TeraGamePacketCode code, scoped ReadOnlySpan<byte> payload)
     {
         _ = TryPostPacket(code, payload);
     }
 
-    public void PostPacket(AriseGamePacketCode code, ReadOnlySpan<byte> payload)
+    public void PostPacket(AriseGamePacketCode code, scoped ReadOnlySpan<byte> payload)
     {
         _ = TryPostPacket(code, payload);
     }
 
-    public bool TryPostPacket(TeraGamePacketCode code, ReadOnlySpan<byte> payload)
+    public bool TryPostPacket(TeraGamePacketCode code, scoped ReadOnlySpan<byte> payload)
     {
         return TryWritePacket(GameConnectionChannel.Tera, (ushort)code, payload, completion: null);
     }
 
-    public bool TryPostPacket(AriseGamePacketCode code, ReadOnlySpan<byte> payload)
+    public bool TryPostPacket(AriseGamePacketCode code, scoped ReadOnlySpan<byte> payload)
     {
         return TryWritePacket(GameConnectionChannel.Arise, (ushort)code, payload, completion: null);
     }
@@ -136,7 +136,10 @@ public async ValueTask<bool> TrySendPacketAsync(AriseGamePacketCode code, ReadOn
     }
 
     private bool TryWritePacket(
-        GameConnectionChannel channel, ushort code, ReadOnlySpan<byte> payload, TaskCompletionSource<bool>? completion)
+        GameConnectionChannel channel,
+        ushort code,
+        scoped ReadOnlySpan<byte> payload,
+        TaskCompletionSource<bool>? completion)
     {
         var buffer = Connection.Manager.Buffers.Get();
 

diff --git a/src/shared/module/PatchableBridgeDataComponent.cs b/src/shared/module/PatchableBridgeDataComponent.cs
@@ -3,7 +3,7 @@ namespace Arise.Bridge;
 public sealed class PatchableBridgeDataComponent : BridgeDataComponent
 {
     [Obfuscation]
-    protected override void InitializeKey(Span<byte> key)
+    protected override void InitializeKey(scoped Span<byte> key)
     {
         // Filled in by the server's BridgeModuleGenerator.
 
@@ -26,7 +26,7 @@ protected override void InitializeKey(Span<byte> key)
     }
 
     [Obfuscation]
-    protected override void InitializeIV(Span<byte> iv)
+    protected override void InitializeIV(scoped Span<byte> iv)
     {
         // Filled in by the server's BridgeModuleGenerator.