Skip to content

Implement ValueAsnReader #125254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcsjones merged 5 commits into from
Mar 7, 2026
+4,755 −1,623
Merged

Implement ValueAsnReader #125254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e08ce65
Add ValueAsnReader ref struct API for System.Formats.Asn1
vcsjones Mar 6, 2026
dce3a99
Replace AsnValueReader with ValueAsnReader in the ASN.1 XSLT generator
vcsjones Mar 6, 2026
dceda0f
Fix overeager rename
vcsjones Mar 6, 2026
c2ed616
Fix incorrect but existing assertion
vcsjones Mar 6, 2026
a563e29
Fix whitespace
vcsjones Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Internal/Cryptography/PkcsHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@ public static AttributeAsn[] NormalizeAttributeSet(

try
{
AsnValueReader reader = new AsnValueReader(normalizedValue, AsnEncodingRules.DER);
AsnValueReader setReader = reader.ReadSetOf();
ValueAsnReader reader = new ValueAsnReader(normalizedValue, AsnEncodingRules.DER);
ValueAsnReader setReader = reader.ReadSetOf();
AttributeAsn[] decodedSet = new AttributeAsn[setItems.Length];
int i = 0;
while (setReader.HasData)
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/AlgorithmIdentifierAsn.xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ internal static AlgorithmIdentifierAsn Decode(Asn1Tag expectedTag, ReadOnlyMemor
{
try
{
AsnValueReader reader = new AsnValueReader(encoded.Span, ruleSet);
ValueAsnReader reader = new ValueAsnReader(encoded.Span, ruleSet);

DecodeCore(ref reader, expectedTag, encoded, out AlgorithmIdentifierAsn decoded);
reader.ThrowIfNotEmpty();
Expand All @@ -68,12 +68,12 @@ internal static AlgorithmIdentifierAsn Decode(Asn1Tag expectedTag, ReadOnlyMemor
}
}

internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out AlgorithmIdentifierAsn decoded)
internal static void Decode(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out AlgorithmIdentifierAsn decoded)
{
Decode(ref reader, Asn1Tag.Sequence, rebind, out decoded);
}

internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out AlgorithmIdentifierAsn decoded)
internal static void Decode(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out AlgorithmIdentifierAsn decoded)
{
try
{
Expand All @@ -85,10 +85,10 @@ internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, Read
}
}

private static void DecodeCore(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out AlgorithmIdentifierAsn decoded)
private static void DecodeCore(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out AlgorithmIdentifierAsn decoded)
{
decoded = default;
AsnValueReader sequenceReader = reader.ReadSequence(expectedTag);
ValueAsnReader sequenceReader = reader.ReadSequence(expectedTag);
ReadOnlySpan<byte> rebindSpan = rebind.Span;
int offset;
ReadOnlySpan<byte> tmpSpan;
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/AttributeAsn.xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ internal static AttributeAsn Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte> en
{
try
{
AsnValueReader reader = new AsnValueReader(encoded.Span, ruleSet);
ValueAsnReader reader = new ValueAsnReader(encoded.Span, ruleSet);

DecodeCore(ref reader, expectedTag, encoded, out AttributeAsn decoded);
reader.ThrowIfNotEmpty();
Expand All @@ -71,12 +71,12 @@ internal static AttributeAsn Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte> en
}
}

internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out AttributeAsn decoded)
internal static void Decode(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out AttributeAsn decoded)
{
Decode(ref reader, Asn1Tag.Sequence, rebind, out decoded);
}

internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out AttributeAsn decoded)
internal static void Decode(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out AttributeAsn decoded)
{
try
{
Expand All @@ -88,11 +88,11 @@ internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, Read
}
}

private static void DecodeCore(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out AttributeAsn decoded)
private static void DecodeCore(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out AttributeAsn decoded)
{
decoded = default;
AsnValueReader sequenceReader = reader.ReadSequence(expectedTag);
AsnValueReader collectionReader;
ValueAsnReader sequenceReader = reader.ReadSequence(expectedTag);
ValueAsnReader collectionReader;
ReadOnlySpan<byte> rebindSpan = rebind.Span;
int offset;
ReadOnlySpan<byte> tmpSpan;
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/CurveAsn.xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ internal static CurveAsn Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte> encode
{
try
{
AsnValueReader reader = new AsnValueReader(encoded.Span, ruleSet);
ValueAsnReader reader = new ValueAsnReader(encoded.Span, ruleSet);

DecodeCore(ref reader, expectedTag, encoded, out CurveAsn decoded);
reader.ThrowIfNotEmpty();
Expand All @@ -56,12 +56,12 @@ internal static CurveAsn Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte> encode
}
}

internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out CurveAsn decoded)
internal static void Decode(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out CurveAsn decoded)
{
Decode(ref reader, Asn1Tag.Sequence, rebind, out decoded);
}

internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out CurveAsn decoded)
internal static void Decode(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out CurveAsn decoded)
{
try
{
Expand All @@ -73,10 +73,10 @@ internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, Read
}
}

private static void DecodeCore(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out CurveAsn decoded)
private static void DecodeCore(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out CurveAsn decoded)
{
decoded = default;
AsnValueReader sequenceReader = reader.ReadSequence(expectedTag);
ValueAsnReader sequenceReader = reader.ReadSequence(expectedTag);
ReadOnlySpan<byte> rebindSpan = rebind.Span;
int offset;
ReadOnlySpan<byte> tmpSpan;
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/DigestInfoAsn.xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ internal static DigestInfoAsn Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte> e
{
try
{
AsnValueReader reader = new AsnValueReader(encoded.Span, ruleSet);
ValueAsnReader reader = new ValueAsnReader(encoded.Span, ruleSet);

DecodeCore(ref reader, expectedTag, encoded, out DigestInfoAsn decoded);
reader.ThrowIfNotEmpty();
Expand All @@ -49,12 +49,12 @@ internal static DigestInfoAsn Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte> e
}
}

internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out DigestInfoAsn decoded)
internal static void Decode(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out DigestInfoAsn decoded)
{
Decode(ref reader, Asn1Tag.Sequence, rebind, out decoded);
}

internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out DigestInfoAsn decoded)
internal static void Decode(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out DigestInfoAsn decoded)
{
try
{
Expand All @@ -66,10 +66,10 @@ internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, Read
}
}

private static void DecodeCore(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out DigestInfoAsn decoded)
private static void DecodeCore(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out DigestInfoAsn decoded)
{
decoded = default;
AsnValueReader sequenceReader = reader.ReadSequence(expectedTag);
ValueAsnReader sequenceReader = reader.ReadSequence(expectedTag);
ReadOnlySpan<byte> rebindSpan = rebind.Span;
int offset;
ReadOnlySpan<byte> tmpSpan;
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/DirectoryStringAsn.xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ internal static DirectoryStringAsn Decode(ReadOnlyMemory<byte> encoded, AsnEncod
{
try
{
AsnValueReader reader = new AsnValueReader(encoded.Span, ruleSet);
ValueAsnReader reader = new ValueAsnReader(encoded.Span, ruleSet);

DecodeCore(ref reader, encoded, out DirectoryStringAsn decoded);
reader.ThrowIfNotEmpty();
Expand All @@ -126,7 +126,7 @@ internal static DirectoryStringAsn Decode(ReadOnlyMemory<byte> encoded, AsnEncod
}
}

internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out DirectoryStringAsn decoded)
internal static void Decode(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out DirectoryStringAsn decoded)
{
try
{
Expand All @@ -138,7 +138,7 @@ internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebi
}
}

private static void DecodeCore(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out DirectoryStringAsn decoded)
private static void DecodeCore(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out DirectoryStringAsn decoded)
{
decoded = default;
Asn1Tag tag = reader.PeekTag();
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/DssParms.xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ internal static DssParms Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte> encode
{
try
{
AsnValueReader reader = new AsnValueReader(encoded.Span, ruleSet);
ValueAsnReader reader = new ValueAsnReader(encoded.Span, ruleSet);

DecodeCore(ref reader, expectedTag, out DssParms decoded);
reader.ThrowIfNotEmpty();
Expand All @@ -51,12 +51,12 @@ internal static DssParms Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte> encode
}
}

internal static void Decode(ref AsnValueReader reader, out DssParms decoded)
internal static void Decode(ref ValueAsnReader reader, out DssParms decoded)
{
Decode(ref reader, Asn1Tag.Sequence, out decoded);
}

internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, out DssParms decoded)
internal static void Decode(ref ValueAsnReader reader, Asn1Tag expectedTag, out DssParms decoded)
{
try
{
Expand All @@ -68,10 +68,10 @@ internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, out
}
}

private static void DecodeCore(ref AsnValueReader reader, Asn1Tag expectedTag, out DssParms decoded)
private static void DecodeCore(ref ValueAsnReader reader, Asn1Tag expectedTag, out DssParms decoded)
{
decoded = default;
AsnValueReader sequenceReader = reader.ReadSequence(expectedTag);
ValueAsnReader sequenceReader = reader.ReadSequence(expectedTag);

decoded.P = sequenceReader.ReadInteger();
decoded.Q = sequenceReader.ReadInteger();
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/ECDomainParameters.xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ internal static ECDomainParameters Decode(ReadOnlyMemory<byte> encoded, AsnEncod
{
try
{
AsnValueReader reader = new AsnValueReader(encoded.Span, ruleSet);
ValueAsnReader reader = new ValueAsnReader(encoded.Span, ruleSet);

DecodeCore(ref reader, encoded, out ECDomainParameters decoded);
reader.ThrowIfNotEmpty();
Expand All @@ -84,7 +84,7 @@ internal static ECDomainParameters Decode(ReadOnlyMemory<byte> encoded, AsnEncod
}
}

internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out ECDomainParameters decoded)
internal static void Decode(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out ECDomainParameters decoded)
{
try
{
Expand All @@ -96,7 +96,7 @@ internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebi
}
}

private static void DecodeCore(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out ECDomainParameters decoded)
private static void DecodeCore(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out ECDomainParameters decoded)
{
decoded = default;
Asn1Tag tag = reader.PeekTag();
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/ECPrivateKey.xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ internal static ECPrivateKey Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte> en
{
try
{
AsnValueReader reader = new AsnValueReader(encoded.Span, ruleSet);
ValueAsnReader reader = new ValueAsnReader(encoded.Span, ruleSet);

DecodeCore(ref reader, expectedTag, encoded, out ECPrivateKey decoded);
reader.ThrowIfNotEmpty();
Expand All @@ -67,12 +67,12 @@ internal static ECPrivateKey Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte> en
}
}

internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out ECPrivateKey decoded)
internal static void Decode(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out ECPrivateKey decoded)
{
Decode(ref reader, Asn1Tag.Sequence, rebind, out decoded);
}

internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out ECPrivateKey decoded)
internal static void Decode(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out ECPrivateKey decoded)
{
try
{
Expand All @@ -84,11 +84,11 @@ internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, Read
}
}

private static void DecodeCore(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out ECPrivateKey decoded)
private static void DecodeCore(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out ECPrivateKey decoded)
{
decoded = default;
AsnValueReader sequenceReader = reader.ReadSequence(expectedTag);
AsnValueReader explicitReader;
ValueAsnReader sequenceReader = reader.ReadSequence(expectedTag);
ValueAsnReader explicitReader;
ReadOnlySpan<byte> rebindSpan = rebind.Span;
int offset;
ReadOnlySpan<byte> tmpSpan;
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/EdiPartyNameAsn.xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ internal static EdiPartyNameAsn Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte>
{
try
{
AsnValueReader reader = new AsnValueReader(encoded.Span, ruleSet);
ValueAsnReader reader = new ValueAsnReader(encoded.Span, ruleSet);

DecodeCore(ref reader, expectedTag, encoded, out EdiPartyNameAsn decoded);
reader.ThrowIfNotEmpty();
Expand All @@ -58,12 +58,12 @@ internal static EdiPartyNameAsn Decode(Asn1Tag expectedTag, ReadOnlyMemory<byte>
}
}

internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out EdiPartyNameAsn decoded)
internal static void Decode(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out EdiPartyNameAsn decoded)
{
Decode(ref reader, Asn1Tag.Sequence, rebind, out decoded);
}

internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out EdiPartyNameAsn decoded)
internal static void Decode(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out EdiPartyNameAsn decoded)
{
try
{
Expand All @@ -75,11 +75,11 @@ internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, Read
}
}

private static void DecodeCore(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out EdiPartyNameAsn decoded)
private static void DecodeCore(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out EdiPartyNameAsn decoded)
{
decoded = default;
AsnValueReader sequenceReader = reader.ReadSequence(expectedTag);
AsnValueReader explicitReader;
ValueAsnReader sequenceReader = reader.ReadSequence(expectedTag);
ValueAsnReader explicitReader;


if (sequenceReader.HasData && sequenceReader.PeekTag().HasSameClassAndValue(new Asn1Tag(TagClass.ContextSpecific, 0)))
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/EncryptedPrivateKeyInfoAsn.xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ internal static EncryptedPrivateKeyInfoAsn Decode(Asn1Tag expectedTag, ReadOnlyM
{
try
{
AsnValueReader reader = new AsnValueReader(encoded.Span, ruleSet);
ValueAsnReader reader = new ValueAsnReader(encoded.Span, ruleSet);

DecodeCore(ref reader, expectedTag, encoded, out EncryptedPrivateKeyInfoAsn decoded);
reader.ThrowIfNotEmpty();
Expand All @@ -49,12 +49,12 @@ internal static EncryptedPrivateKeyInfoAsn Decode(Asn1Tag expectedTag, ReadOnlyM
}
}

internal static void Decode(ref AsnValueReader reader, ReadOnlyMemory<byte> rebind, out EncryptedPrivateKeyInfoAsn decoded)
internal static void Decode(ref ValueAsnReader reader, ReadOnlyMemory<byte> rebind, out EncryptedPrivateKeyInfoAsn decoded)
{
Decode(ref reader, Asn1Tag.Sequence, rebind, out decoded);
}

internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out EncryptedPrivateKeyInfoAsn decoded)
internal static void Decode(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out EncryptedPrivateKeyInfoAsn decoded)
{
try
{
Expand All @@ -66,10 +66,10 @@ internal static void Decode(ref AsnValueReader reader, Asn1Tag expectedTag, Read
}
}

private static void DecodeCore(ref AsnValueReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out EncryptedPrivateKeyInfoAsn decoded)
private static void DecodeCore(ref ValueAsnReader reader, Asn1Tag expectedTag, ReadOnlyMemory<byte> rebind, out EncryptedPrivateKeyInfoAsn decoded)
{
decoded = default;
AsnValueReader sequenceReader = reader.ReadSequence(expectedTag);
ValueAsnReader sequenceReader = reader.ReadSequence(expectedTag);
ReadOnlySpan<byte> rebindSpan = rebind.Span;
int offset;
ReadOnlySpan<byte> tmpSpan;
Expand Down
Loading
Loading