wip

Author: DeagleGross

src/DataProtection/DataProtection/src/KeyManagement/KeyRingBasedDataProtector.cs

@@ -34,7 +34,7 @@ internal sealed unsafe class KeyRingBasedDataProtector : IDataProtector, IPersis
     private readonly IKeyRingProvider _keyRingProvider;
     private readonly ILogger? _logger;
 
-    private static readonly int _magicHeaderKeyIdSize = (sizeof(uint) + sizeof(Guid));
+    private static readonly int _magicHeaderKeyIdSize = sizeof(uint) + sizeof(Guid);
 
     public KeyRingBasedDataProtector(IKeyRingProvider keyRingProvider, ILogger? logger, string[]? originalPurposes, string newPurpose)
     {

src/DataProtection/DataProtection/src/Managed/ManagedAuthenticatedEncryptor.cs

@@ -416,19 +416,6 @@ public byte[] Encrypt(ArraySegment<byte> plaintext, ArraySegment<byte> additiona
         additionalAuthenticatedData.Validate();
         var plainTextSpan = plaintext.AsSpan();
 
-#if NET10_0_OR_GREATER
-        var size = GetEncryptedSize(plainTextSpan.Length);
-        var retVal = new byte[size];
-        if (!TryEncrypt(plaintext.AsSpan(), additionalAuthenticatedData.AsSpan(), retVal, out var bytesWritten))
-        {
-            // TODO understand what we really expect here
-            throw Error.CryptCommon_GenericError();
-        }
-
-        Debug.Assert(bytesWritten == size, "bytesWritten == size");
-        return retVal;
-#endif
-
         try
         {
             var keyModifierLength = KEY_MODIFIER_SIZE_IN_BYTES;