1 files changed, 13 insertions, 24 deletions
diff --git a/crypto/src/asn1/x509/IssuerSerial.cs b/crypto/src/asn1/x509/IssuerSerial.cs
index 2c26339bd..09b6dae18 100644
--- a/crypto/src/asn1/x509/IssuerSerial.cs
+++ b/crypto/src/asn1/x509/IssuerSerial.cs
@@ -1,40 +1,29 @@
using System;
-using Org.BouncyCastle.Utilities;
-
namespace Org.BouncyCastle.Asn1.X509
{
public class IssuerSerial
: Asn1Encodable
{
- internal readonly GeneralNames issuer;
- internal readonly DerInteger serial;
- internal readonly DerBitString issuerUid;
-
- public static IssuerSerial GetInstance(
- object obj)
+ public static IssuerSerial GetInstance(object obj)
{
- if (obj == null || obj is IssuerSerial)
- {
- return (IssuerSerial) obj;
- }
-
- if (obj is Asn1Sequence)
- {
- return new IssuerSerial((Asn1Sequence) obj);
- }
-
- throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(obj), "obj");
+ if (obj == null)
+ return null;
+ if (obj is IssuerSerial issuerSerial)
+ return issuerSerial;
+ return new IssuerSerial(Asn1Sequence.GetInstance(obj));
}
- public static IssuerSerial GetInstance(
- Asn1TaggedObject obj,
- bool explicitly)
+ public static IssuerSerial GetInstance(Asn1TaggedObject obj, bool explicitly)
{
- return GetInstance(Asn1Sequence.GetInstance(obj, explicitly));
+ return new IssuerSerial(Asn1Sequence.GetInstance(obj, explicitly));
}
- private IssuerSerial(
+ private readonly GeneralNames issuer;
+ private readonly DerInteger serial;
+ private readonly DerBitString issuerUid;
+
+ private IssuerSerial(
Asn1Sequence seq)
{
if (seq.Count != 2 && seq.Count != 3)
|