fix reading spans

DeagleGross · DeagleGross · commit 6b4823bcb952 · 2025-11-07T14:22:09.000+01:00
diff --git a/src/DataProtection/DataProtection/src/Cng/CbcAuthenticatedEncryptor.cs b/src/DataProtection/DataProtection/src/Cng/CbcAuthenticatedEncryptor.cs
@@ -197,7 +197,7 @@ public byte[] Decrypt(ArraySegment<byte> ciphertext, ArraySegment<byte> addition
         try
         {
             Decrypt(ciphertext, additionalAuthenticatedData, ref pooledArrayBuffer);
-            return pooledArrayBuffer.GetSpan(pooledArrayBuffer.WrittenCount).ToArray();
+            return pooledArrayBuffer.WrittenSpan.ToArray();
         }
         finally
         {
@@ -395,8 +395,8 @@ public byte[] Encrypt(ArraySegment<byte> plaintext, ArraySegment<byte> additiona
             Encrypt(plaintext, additionalAuthenticatedData, ref pooledArrayBuffer);
             pooledArrayBuffer.Advance(postBufferSize);
 
-            var resultSpan = pooledArrayBuffer.GetSpan(pooledArrayBuffer.WrittenCount).ToArray();
-            CryptoUtil.Assert(resultSpan.Length == outputSize, "bytesWritten == size");
+            var resultSpan = pooledArrayBuffer.WrittenSpan.ToArray();
+            CryptoUtil.Assert(resultSpan.Length == outputSize, "writtenSpan length should equal calculated outputSize");
 
             return resultSpan;
         }
diff --git a/src/DataProtection/DataProtection/src/Cng/CngGcmAuthenticatedEncryptor.cs b/src/DataProtection/DataProtection/src/Cng/CngGcmAuthenticatedEncryptor.cs
@@ -163,7 +163,7 @@ public byte[] Decrypt(ArraySegment<byte> ciphertext, ArraySegment<byte> addition
         try
         {
             Decrypt(ciphertext, additionalAuthenticatedData, ref pooledArrayBuffer);
-            return pooledArrayBuffer.GetSpan(pooledArrayBuffer.WrittenCount).ToArray();
+            return pooledArrayBuffer.WrittenSpan.ToArray();
         }
         finally
         {
@@ -310,9 +310,13 @@ public byte[] Encrypt(ArraySegment<byte> plaintext, ArraySegment<byte> additiona
         var pooledArrayBuffer = new PooledArrayBufferWriter<byte>(outputSize);
         try
         {
+            pooledArrayBuffer.Advance((int)preBufferSize);
             Encrypt(plaintext, additionalAuthenticatedData, ref pooledArrayBuffer);
-            CryptoUtil.Assert(pooledArrayBuffer.WrittenCount == size, "bytesWritten == size");
-            return pooledArrayBuffer.GetSpan(pooledArrayBuffer.WrittenCount).ToArray();
+            pooledArrayBuffer.Advance((int)postBufferSize);
+
+            var resultSpan = pooledArrayBuffer.WrittenSpan.ToArray();
+            CryptoUtil.Assert(resultSpan.Length == outputSize, "writtenSpan length should equal calculated outputSize");
+            return resultSpan;
         }
         finally
         {

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public byte[] Decrypt(ArraySegment<byte> ciphertext, ArraySegment<byte> addition`
`197`	`197`	`try`
`198`	`198`	`{`
`199`	`199`	`Decrypt(ciphertext, additionalAuthenticatedData, ref pooledArrayBuffer);`
`200`		`- return pooledArrayBuffer.GetSpan(pooledArrayBuffer.WrittenCount).ToArray();`
	`200`	`+ return pooledArrayBuffer.WrittenSpan.ToArray();`
`201`	`201`	`}`
`202`	`202`	`finally`
`203`	`203`	`{`
`@@ -395,8 +395,8 @@ public byte[] Encrypt(ArraySegment<byte> plaintext, ArraySegment<byte> additiona`
`395`	`395`	`Encrypt(plaintext, additionalAuthenticatedData, ref pooledArrayBuffer);`
`396`	`396`	`pooledArrayBuffer.Advance(postBufferSize);`
`397`	`397`
`398`		`- var resultSpan = pooledArrayBuffer.GetSpan(pooledArrayBuffer.WrittenCount).ToArray();`
`399`		`- CryptoUtil.Assert(resultSpan.Length == outputSize, "bytesWritten == size");`
	`398`	`+ var resultSpan = pooledArrayBuffer.WrittenSpan.ToArray();`
	`399`	`+ CryptoUtil.Assert(resultSpan.Length == outputSize, "writtenSpan length should equal calculated outputSize");`
`400`	`400`
`401`	`401`	`return resultSpan;`
`402`	`402`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public byte[] Decrypt(ArraySegment<byte> ciphertext, ArraySegment<byte> addition`
`163`	`163`	`try`
`164`	`164`	`{`
`165`	`165`	`Decrypt(ciphertext, additionalAuthenticatedData, ref pooledArrayBuffer);`
`166`		`- return pooledArrayBuffer.GetSpan(pooledArrayBuffer.WrittenCount).ToArray();`
	`166`	`+ return pooledArrayBuffer.WrittenSpan.ToArray();`
`167`	`167`	`}`
`168`	`168`	`finally`
`169`	`169`	`{`
`@@ -310,9 +310,13 @@ public byte[] Encrypt(ArraySegment<byte> plaintext, ArraySegment<byte> additiona`
`310`	`310`	`var pooledArrayBuffer = new PooledArrayBufferWriter<byte>(outputSize);`
`311`	`311`	`try`
`312`	`312`	`{`
	`313`	`+ pooledArrayBuffer.Advance((int)preBufferSize);`
`313`	`314`	`Encrypt(plaintext, additionalAuthenticatedData, ref pooledArrayBuffer);`
`314`		`- CryptoUtil.Assert(pooledArrayBuffer.WrittenCount == size, "bytesWritten == size");`
`315`		`- return pooledArrayBuffer.GetSpan(pooledArrayBuffer.WrittenCount).ToArray();`
	`315`	`+ pooledArrayBuffer.Advance((int)postBufferSize);`
	`316`	`+`
	`317`	`+ var resultSpan = pooledArrayBuffer.WrittenSpan.ToArray();`
	`318`	`+ CryptoUtil.Assert(resultSpan.Length == outputSize, "writtenSpan length should equal calculated outputSize");`
	`319`	`+ return resultSpan;`
`316`	`320`	`}`
`317`	`321`	`finally`
`318`	`322`	`{`