Extracted ArrayExtensions to clear arrays.

somdoron · Jul 24, 2020 · aee0c42 · aee0c42
1 parent 93e472b
commit aee0c42
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/NaCl.net/ArrayExtensions.cs b/NaCl.net/ArrayExtensions.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Runtime.CompilerServices;
+
+namespace NetMQ.Utils
+{
+    internal static class ArrayExtensions
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void Clear<T>(this T[] array)
+        {
+            if (array != null)
+            {
+                Array.Clear(array, 0, array.Length);
+            }
+        }
+    }
+}
diff --git a/NaCl.net/Internal/StreamSalsa20.cs b/NaCl.net/Internal/StreamSalsa20.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.CompilerServices;
+using NetMQ.Utils;
 
 namespace NaCl.Internal
 {
@@ -48,8 +49,9 @@ static public void Transform(Span<byte> c, ReadOnlySpan<byte> n, ReadOnlySpan<by
             }
             finally
             {
-                Array.Clear(block, 0, block.Length);
-                Array.Clear(kcopy, 0, kcopy.Length);
+                input.Clear();
+                block.Clear();
+                kcopy.Clear();
             }
         }
     }

diff --git a/NaCl.net/Internal/StreamSalsa20Xor.cs b/NaCl.net/Internal/StreamSalsa20Xor.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.CompilerServices;
+using NetMQ.Utils;
 
 namespace NaCl.Internal
 {
@@ -62,8 +63,9 @@ public static void Transform(Span<byte> c, ReadOnlySpan<byte> m, ReadOnlySpan<by
             }
             finally
             {
-                Array.Clear(block, 0, block.Length);
-                Array.Clear(kcopy, 0, kcopy.Length);
+                input.Clear();
+                block.Clear();
+                kcopy.Clear();
             }
         }
     }