diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2022-06-24 11:49:55 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2022-06-24 11:49:55 +0700 |
| commit | 33e4b035e8dc3721cd311956227ad29c0f8a97d0 (patch) | |
| tree | 61afd296ddc5e40bad9a72c3c7976a16e2796e42 /crypto/src/asn1 | |
| parent | Simplify attributes (diff) | |
| download | BouncyCastle.NET-ed25519-33e4b035e8dc3721cd311956227ad29c0f8a97d0.tar.xz | |
Some modern syntax updates
Diffstat (limited to 'crypto/src/asn1')
| -rw-r--r-- | crypto/src/asn1/ASN1StreamParser.cs | 4 | ||||
| -rw-r--r-- | crypto/src/asn1/Asn1InputStream.cs | 15 | ||||
| -rw-r--r-- | crypto/src/asn1/Asn1TaggedObject.cs | 16 |
3 files changed, 16 insertions, 19 deletions
diff --git a/crypto/src/asn1/ASN1StreamParser.cs b/crypto/src/asn1/ASN1StreamParser.cs index f805f68a5..490b20ccf 100644 --- a/crypto/src/asn1/ASN1StreamParser.cs +++ b/crypto/src/asn1/ASN1StreamParser.cs @@ -235,9 +235,9 @@ namespace Org.BouncyCastle.Asn1 private void Set00Check(bool enabled) { - if (_in is IndefiniteLengthInputStream) + if (_in is IndefiniteLengthInputStream indef) { - ((IndefiniteLengthInputStream)_in).SetEofOn00(enabled); + indef.SetEofOn00(enabled); } } } diff --git a/crypto/src/asn1/Asn1InputStream.cs b/crypto/src/asn1/Asn1InputStream.cs index 33e7b0e0c..1df6a0206 100644 --- a/crypto/src/asn1/Asn1InputStream.cs +++ b/crypto/src/asn1/Asn1InputStream.cs @@ -21,17 +21,14 @@ namespace Org.BouncyCastle.Asn1 internal static int FindLimit(Stream input) { - if (input is LimitedInputStream) - return ((LimitedInputStream)input).Limit; + if (input is LimitedInputStream limited) + return limited.Limit; - if (input is Asn1InputStream) - return ((Asn1InputStream)input).Limit; + if (input is Asn1InputStream asn1) + return asn1.Limit; - if (input is MemoryStream) - { - MemoryStream mem = (MemoryStream)input; - return (int)(mem.Length - mem.Position); - } + if (input is MemoryStream memory) + return (int)(memory.Length - memory.Position); return int.MaxValue; } diff --git a/crypto/src/asn1/Asn1TaggedObject.cs b/crypto/src/asn1/Asn1TaggedObject.cs index cba199fb3..46aa137a8 100644 --- a/crypto/src/asn1/Asn1TaggedObject.cs +++ b/crypto/src/asn1/Asn1TaggedObject.cs @@ -26,17 +26,17 @@ namespace Org.BouncyCastle.Asn1 return (Asn1TaggedObject)obj; } //else if (obj is Asn1TaggedObjectParser) - else if (obj is IAsn1Convertible) + else if (obj is IAsn1Convertible asn1Convertible) { - Asn1Object asn1Object = ((IAsn1Convertible)obj).ToAsn1Object(); - if (asn1Object is Asn1TaggedObject) - return (Asn1TaggedObject)asn1Object; + Asn1Object asn1Object = asn1Convertible.ToAsn1Object(); + if (asn1Object is Asn1TaggedObject taggedObject) + return taggedObject; } - else if (obj is byte[]) + else if (obj is byte[] byteArray) { try { - return CheckedCast(FromByteArray((byte[])obj)); + return CheckedCast(FromByteArray(byteArray)); } catch (IOException e) { @@ -313,8 +313,8 @@ namespace Org.BouncyCastle.Asn1 return universalType.FromImplicitConstructed(RebuildConstructed(baseObject)); case ParsedImplicit: { - if (baseObject is Asn1Sequence) - return universalType.FromImplicitConstructed((Asn1Sequence)baseObject); + if (baseObject is Asn1Sequence asn1Sequence) + return universalType.FromImplicitConstructed(asn1Sequence); return universalType.FromImplicitPrimitive((DerOctetString)baseObject); } |