Fix build errors

dotnet · Nov 4, 2024 · b5d1656 · b5d1656
1 parent 14eee79
commit b5d1656
Show file tree

Hide file tree

Showing 27 changed files with 205 additions and 179 deletions.
diff --git a/...tion/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs b/...tion/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs
@@ -29,7 +29,7 @@ public void Encrypt_Decrypt_RoundTrips()
         byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
 
         // Assert
-        Assert.Equal(plaintext, decipheredtext);
+        Assert.Equal(plaintext.AsSpan(), decipheredtext);
     }
 
     [ConditionalFact]

diff --git a/...tion/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs b/...tion/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs
@@ -26,7 +26,7 @@ public void Encrypt_Decrypt_RoundTrips()
         byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
 
         // Assert
-        Assert.Equal(plaintext, decipheredtext);
+        Assert.Equal(plaintext.AsSpan(), decipheredtext);
     }
 
     [ConditionalFact]
@@ -100,6 +100,6 @@ public void Encrypt_KnownKey()
         //         | 00 00 00 00 (postBuffer)
 
         string retValAsString = Convert.ToBase64String(retVal);
-        Assert.Equal("AAAAAAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaG0O2kY0NZtmh2UQtXY5B2jlgnOgAAAAA", retValAsString);
+        Assert.Equal("AAAAAAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaG0O2kY0NZtmh2UQtXY5B2jlgnOgAAAAA".AsSpan(), retValAsString);
     }
 }
diff --git a/...Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingBasedDataProtectorTests.cs b/...Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingBasedDataProtectorTests.cs
@@ -45,8 +45,8 @@ public void Protect_EncryptsToDefaultProtector_MultiplePurposes()
             .Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
             {
-                Assert.Equal(expectedPlaintext, actualPlaintext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedPlaintext.AsSpan(), actualPlaintext);
+                Assert.Equal(expectedAad.AsSpan(), actualAad);
                 return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
             });
 
@@ -83,8 +83,8 @@ public void Protect_EncryptsToDefaultProtector_SinglePurpose()
             .Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
             {
-                Assert.Equal(expectedPlaintext, actualPlaintext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedPlaintext.AsSpan(), actualPlaintext);
+                Assert.Equal(expectedAad.AsSpan(), actualAad);
                 return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
             });
 
@@ -423,8 +423,8 @@ public void Unprotect_KeyRevoked_RevocationAllowed_ReturnsOriginalData_SetsRevok
             .Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
             {
-                Assert.Equal(expectedCiphertext, actualCiphertext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedCiphertext.AsSpan(), actualCiphertext);
+                Assert.Equal(expectedAad.AsSpan(), actualAad);
                 return expectedPlaintext;
             });
         var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
@@ -470,8 +470,8 @@ public void Unprotect_IsAlsoDefaultKey_Success_NoMigrationRequired()
             .Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
             {
-                Assert.Equal(expectedCiphertext, actualCiphertext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedCiphertext.AsSpan(), actualCiphertext);
+                Assert.Equal(expectedAad.AsSpan(), actualAad);
                 return expectedPlaintext;
             });
         var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
@@ -519,8 +519,8 @@ public void Unprotect_IsNotDefaultKey_Success_RequiresMigration()
             .Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
             {
-                Assert.Equal(expectedCiphertext, actualCiphertext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedCiphertext.AsSpan(), actualCiphertext);
+                Assert.Equal(expectedAad.AsSpan(), actualAad);
                 return expectedPlaintext;
             });
         var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
@@ -594,8 +594,8 @@ public void CreateProtector_ChainsPurposes()
             .Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
             {
-                Assert.Equal(expectedPlaintext, actualPlaintext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedPlaintext.AsSpan(), actualPlaintext);
+                Assert.Equal(expectedAad.AsSpan(), actualAad);
                 return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
             });
 

diff --git a/...t/Microsoft.AspNetCore.DataProtection.Tests/Managed/ManagedAuthenticatedEncryptorTests.cs b/...t/Microsoft.AspNetCore.DataProtection.Tests/Managed/ManagedAuthenticatedEncryptorTests.cs
@@ -25,7 +25,7 @@ public void Encrypt_Decrypt_RoundTrips()
         byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
 
         // Assert
-        Assert.Equal(plaintext, decipheredtext);
+        Assert.Equal(plaintext.AsSpan(), decipheredtext);
     }
 
     [Fact]

diff --git a/src/Http/Headers/test/CacheControlHeaderValueTest.cs b/src/Http/Headers/test/CacheControlHeaderValueTest.cs
@@ -47,14 +47,14 @@ public void Properties_SetAndGetAllProperties_SetValueReturnedInGetter()
         Assert.Throws<FormatException>(() => cacheControl.NoCacheHeaders.Add("invalid PLACEHOLDER"));
         cacheControl.NoCacheHeaders.Add("PLACEHOLDER");
         Assert.Single(cacheControl.NoCacheHeaders);
-        Assert.Equal("PLACEHOLDER", cacheControl.NoCacheHeaders.First());
+        Assert.Equal("PLACEHOLDER".AsSpan(), cacheControl.NoCacheHeaders.First());
 
         Assert.NotNull(cacheControl.PrivateHeaders);
         Assert.Throws<ArgumentException>(() => cacheControl.PrivateHeaders.Add(null));
         Assert.Throws<FormatException>(() => cacheControl.PrivateHeaders.Add("invalid PLACEHOLDER"));
         cacheControl.PrivateHeaders.Add("PLACEHOLDER");
         Assert.Single(cacheControl.PrivateHeaders);
-        Assert.Equal("PLACEHOLDER", cacheControl.PrivateHeaders.First());
+        Assert.Equal("PLACEHOLDER".AsSpan(), cacheControl.PrivateHeaders.First());
 
         // NameValueHeaderValue collection property
         Assert.NotNull(cacheControl.Extensions);