Skip to content

Use ValueAsnReader in more places where it is easy to do so #125346

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 1 commit into from
Mar 10, 2026
Merged

Use ValueAsnReader in more places where it is easy to do so #125346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/System/Security/Cryptography/RSAAppleCrypto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ public override RSAParameters ExportParameters(bool includePrivateParameters)
// is used.
RSAParameters key;

AsnReader reader = new AsnReader(keyBlob, AsnEncodingRules.BER);
AsnReader sequenceReader = reader.ReadSequence();
ValueAsnReader reader = new(keyBlob, AsnEncodingRules.BER);
ValueAsnReader sequenceReader = reader.ReadSequence();

if (sequenceReader.PeekTag().Equals(Asn1Tag.Integer))
{
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.macOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ private static RSAParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool
// is used.
RSAParameters key;

AsnReader reader = new AsnReader(keyBlob, AsnEncodingRules.BER);
AsnReader sequenceReader = reader.ReadSequence();
ValueAsnReader reader = new(keyBlob, AsnEncodingRules.BER);
ValueAsnReader sequenceReader = reader.ReadSequence();

if (sequenceReader.PeekTag().Equals(Asn1Tag.Integer))
{
Expand Down
2 changes: 1 addition & 1 deletion ...aries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private static SymmetricAlgorithm OpenAlgorithm(AlgorithmIdentifierAsn contentEn

try
{
AsnReader reader = new AsnReader(contentEncryptionAlgorithm.Parameters.Value, AsnEncodingRules.BER);
ValueAsnReader reader = new(contentEncryptionAlgorithm.Parameters.Value.Span, AsnEncodingRules.BER);
alg.IV = reader.ReadOctetString();

if (alg.IV.Length != alg.BlockSize / 8)
Expand Down
8 changes: 4 additions & 4 deletions ...s/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSignature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ private static bool DsaDerToIeee(

try
{
AsnReader reader = new AsnReader(derSignature, AsnEncodingRules.DER);
AsnReader sequence = reader.ReadSequence();
ValueAsnReader reader = new(derSignature.Span, AsnEncodingRules.DER);
ValueAsnReader sequence = reader.ReadSequence();

if (reader.HasData)
{
Expand All @@ -191,7 +191,7 @@ private static bool DsaDerToIeee(
// partial-fill gymnastics.
ieeeSignature.Clear();

ReadOnlySpan<byte> val = sequence.ReadIntegerBytes().Span;
ReadOnlySpan<byte> val = sequence.ReadIntegerBytes();

if (val.Length > fieldSize && val[0] == 0)
{
Expand All @@ -203,7 +203,7 @@ private static bool DsaDerToIeee(
val.CopyTo(ieeeSignature.Slice(fieldSize - val.Length, val.Length));
}

val = sequence.ReadIntegerBytes().Span;
val = sequence.ReadIntegerBytes();

if (val.Length > fieldSize && val[0] == 0)
{
Expand Down
10 changes: 5 additions & 5 deletions ...aries/System.Security.Cryptography/src/System/Security/Cryptography/EccKeyFormatHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@ private static ECCurve GetSpecifiedECCurveCore(SpecifiedECDomain specifiedParame
{
case Oids.EcPrimeField:
prime = true;
AsnReader primeReader = new AsnReader(specifiedParameters.FieldID.Parameters, AsnEncodingRules.BER);
ReadOnlySpan<byte> primeValue = primeReader.ReadIntegerBytes().Span;
ValueAsnReader primeReader = new(specifiedParameters.FieldID.Parameters.Span, AsnEncodingRules.BER);
ReadOnlySpan<byte> primeValue = primeReader.ReadIntegerBytes();
primeReader.ThrowIfNotEmpty();

if (primeValue[0] == 0)
Expand All @@ -331,8 +331,8 @@ private static ECCurve GetSpecifiedECCurveCore(SpecifiedECDomain specifiedParame
break;
case Oids.EcChar2Field:
prime = false;
AsnReader char2Reader = new AsnReader(specifiedParameters.FieldID.Parameters, AsnEncodingRules.BER);
AsnReader innerReader = char2Reader.ReadSequence();
ValueAsnReader char2Reader = new(specifiedParameters.FieldID.Parameters.Span, AsnEncodingRules.BER);
ValueAsnReader innerReader = char2Reader.ReadSequence();
char2Reader.ThrowIfNotEmpty();

// Characteristic-two ::= SEQUENCE
Expand Down Expand Up @@ -368,7 +368,7 @@ private static ECCurve GetSpecifiedECCurveCore(SpecifiedECDomain specifiedParame
// k2 INTEGER, -- k2 > k1
// k3 INTEGER -- k3 > k2
// }
AsnReader pentanomialReader = innerReader.ReadSequence();
ValueAsnReader pentanomialReader = innerReader.ReadSequence();

if (!pentanomialReader.TryReadInt32(out k1) ||
!pentanomialReader.TryReadInt32(out k2) ||
Expand Down
2 changes: 1 addition & 1 deletion ...ryptography/src/System/Security/Cryptography/X509Certificates/ManagedCertificateFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public void FindByTemplateName(string templateName)
try
{
// Try a V1 template structure, just a string:
AsnReader reader = new AsnReader(ext.RawData, AsnEncodingRules.DER);
ValueAsnReader reader = new(ext.RawData, AsnEncodingRules.DER);
decodedName = reader.ReadAnyAsnString();
reader.ThrowIfNotEmpty();
}
Expand Down
4 changes: 2 additions & 2 deletions ...graphy/src/System/Security/Cryptography/X509Certificates/X509EnhancedKeyUsageExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ private static void DecodeX509EnhancedKeyUsageExtension(byte[] encoded, out OidC

try
{
AsnReader reader = new AsnReader(encoded, AsnEncodingRules.BER);
AsnReader sequenceReader = reader.ReadSequence();
ValueAsnReader reader = new(encoded, AsnEncodingRules.BER);
ValueAsnReader sequenceReader = reader.ReadSequence();
reader.ThrowIfNotEmpty();
usages = new OidCollection();

Expand Down
Loading