Merge pull request #62403 from dotnet/backport/pr-62397-to-release/6.0

[release/6.0] Fix re-initialization of hash objects on CNG.
dotnet · Dec 15, 2021 · de46fa4 · de46fa4
2 parents 3b394a2 + 71af4f5
commit de46fa4
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/libraries/Common/src/Internal/Cryptography/HashProviderCng.cs b/src/libraries/Common/src/Internal/Cryptography/HashProviderCng.cs
@@ -127,10 +127,15 @@ public override void Reset()
         {
             if (_reusable && !_running)
                 return;
+
             DestroyHash();
 
+            BCryptCreateHashFlags flags = _reusable ?
+                BCryptCreateHashFlags.BCRYPT_HASH_REUSABLE_FLAG :
+                BCryptCreateHashFlags.None;
+
             SafeBCryptHashHandle hHash;
-            NTSTATUS ntStatus = Interop.BCrypt.BCryptCreateHash(_hAlgorithm, out hHash, IntPtr.Zero, 0, _key, _key == null ? 0 : _key.Length, BCryptCreateHashFlags.None);
+            NTSTATUS ntStatus = Interop.BCrypt.BCryptCreateHash(_hAlgorithm, out hHash, IntPtr.Zero, 0, _key, _key == null ? 0 : _key.Length, flags);
             if (ntStatus != NTSTATUS.STATUS_SUCCESS)
                 throw Interop.BCrypt.CreateCryptographicException(ntStatus);
 

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/HashAlgorithmTest.cs b/src/libraries/System.Security.Cryptography.Algorithms/tests/HashAlgorithmTest.cs
@@ -488,6 +488,30 @@ public void Initialize_TransformBlock_Unused()
             }
         }
 
+        [Fact]
+        public void Initialize_DoubleInitialize_Works()
+        {
+            byte[] hashInput = new byte[] { 1, 2, 3, 4, 5 };
+            byte[] expectedDigest;
+
+            using (HashAlgorithm hash = Create())
+            {
+                expectedDigest = hash.ComputeHash(hashInput);
+            }
+
+            using (HashAlgorithm hash = Create())
+            {
+                byte[] buffer = new byte[1024];
+                hash.TransformBlock(buffer, 0, buffer.Length, buffer, 0);
+                hash.Initialize();
+                hash.TransformFinalBlock(Array.Empty<byte>(), 0, 0);
+                hash.Initialize();
+                hash.TransformFinalBlock(hashInput, 0, hashInput.Length);
+
+                Assert.Equal(expectedDigest, hash.Hash);
+            }
+        }
+
         protected class DataRepeatingStream : Stream
         {
             private int _remaining;