Replace AsnValueReader with ValueAsnReader and remove internal type

src/libraries/Common/src/System/Security/Cryptography/AsnWriter/AsnWriterExtensions.cs

@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Security.Cryptography;
+
+namespace System.Formats.Asn1
+{
+    internal static class AsnWriterExtensions
+    {
+        internal static void WriteEncodedValueForCrypto(
+            this AsnWriter writer,
+            ReadOnlySpan<byte> value)
+        {
+            try
+            {
+                writer.WriteEncodedValue(value);
+            }
+            catch (ArgumentException e)
+            {
+                throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding, e);
+            }
+        }
+
+        internal static void WriteObjectIdentifierForCrypto(
+            this AsnWriter writer,
+            string value)
+        {
+            try
+            {
+                writer.WriteObjectIdentifier(value);
+            }
+            catch (ArgumentException e)
+            {
+                throw new CryptographicException(SR.Cryptography_Der_Invalid_Encoding, e);
+            }
+        }
+    }
+}

src/libraries/Common/src/System/Security/Cryptography/Asn1Reader/System.Security.Cryptography.Asn1Reader.Shared.projitems → src/libraries/Common/src/System/Security/Cryptography/AsnWriter/System.Security.Cryptography.AsnWriter.Shared.projitems

@@ -9,8 +9,8 @@
     </Compile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)AsnValueReader.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnValueReader.cs</Link>
+    <Compile Include="$(MSBuildThisFileDirectory)AsnWriterExtensions.cs">
+      <Link>Common\System\Security\Cryptography\AsnWriter\AsnWriterExtensions.cs</Link>
     </Compile>
   </ItemGroup>
 </Project>

src/libraries/Common/src/System/Security/Cryptography/RSAOpenSsl.cs

@@ -453,30 +453,18 @@ public override void ImportParameters(RSAParameters parameters)
             if (parameters.D != null)
             {
                 AsnWriter writer = RSAKeyFormatHelper.WritePkcs8PrivateKey(parameters);
-                ArraySegment<byte> pkcs8 = writer.RentAndEncode();
-
-                try
-                {
-                    ImportPkcs8PrivateKey(pkcs8, checkAlgorithm: false, out _);
-                }
-                finally
+                writer.Encode(this, static (RSAOpenSsl rsa, ReadOnlySpan<byte> pkcs8) =>
                 {
-                    CryptoPool.Return(pkcs8);
-                }
+                    rsa.ImportPkcs8PrivateKey(pkcs8, checkAlgorithm: false, out _);
+                });
             }
             else
             {
                 AsnWriter writer = RSAKeyFormatHelper.WriteSubjectPublicKeyInfo(parameters);
-                ArraySegment<byte> spki = writer.RentAndEncode();
-
-                try
+                writer.Encode(this, static (RSAOpenSsl rsa, ReadOnlySpan<byte> spki) =>
                 {
-                    ImportSubjectPublicKeyInfo(spki, checkAlgorithm: false, out _);
-                }
-                finally
-                {
-                    CryptoPool.Return(spki);
-                }
+                    rsa.ImportSubjectPublicKeyInfo(spki, checkAlgorithm: false, out _);
+                });
             }
         }
 
@@ -501,16 +489,10 @@ public override void ImportRSAPublicKey(ReadOnlySpan<byte> source, out int bytes
             }
 
             AsnWriter writer = RSAKeyFormatHelper.WriteSubjectPublicKeyInfo(source.Slice(0, read));
-            ArraySegment<byte> spki = writer.RentAndEncode();
-
-            try
-            {
-                ImportSubjectPublicKeyInfo(spki, checkAlgorithm: false, out _);
-            }
-            finally
+            writer.Encode(this, static (RSAOpenSsl rsa, ReadOnlySpan<byte> spki) =>
             {
-                CryptoPool.Return(spki);
-            }
+                rsa.ImportSubjectPublicKeyInfo(spki, checkAlgorithm: false, out _);
+            });
 
             bytesRead = read;
         }
@@ -617,16 +599,11 @@ public override void ImportRSAPrivateKey(ReadOnlySpan<byte> source, out int byte
             }
 
             AsnWriter writer = RSAKeyFormatHelper.WritePkcs8PrivateKey(source.Slice(0, read));
-            ArraySegment<byte> pkcs8 = writer.RentAndEncode();
 
-            try
+            writer.Encode(this, static (RSAOpenSsl rsa, ReadOnlySpan<byte> pkcs8) =>
             {
-                ImportPkcs8PrivateKey(pkcs8, checkAlgorithm: false, out _);
-            }
-            finally
-            {
-                CryptoPool.Return(pkcs8);
-            }
+                rsa.ImportPkcs8PrivateKey(pkcs8, checkAlgorithm: false, out _);
+            });
 
             bytesRead = read;
         }

src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/CompositeMLDsa/CompositeMLDsaTestHelpers.cs

@@ -563,8 +563,8 @@ private static RSAParameters RSAParametersFromRawPrivateKey(ReadOnlySpan<byte> k
         {
             RSAParameters parameters = default;
 
-            AsnValueReader reader = new AsnValueReader(key, AsnEncodingRules.BER);
-            AsnValueReader sequenceReader = reader.ReadSequence(Asn1Tag.Sequence);
+            ValueAsnReader reader = new ValueAsnReader(key, AsnEncodingRules.BER);
+            ValueAsnReader sequenceReader = reader.ReadSequence(Asn1Tag.Sequence);
 
             if (!sequenceReader.TryReadInt32(out int version))
             {