Overhaul Asn1.Cmp

1 files changed, 7 insertions, 4 deletions

diff --git a/crypto/src/asn1/cmp/CertifiedKeyPair.cs b/crypto/src/asn1/cmp/CertifiedKeyPair.cs
index ec60ce965..e26c5c629 100644
--- a/crypto/src/asn1/cmp/CertifiedKeyPair.cs
+++ b/crypto/src/asn1/cmp/CertifiedKeyPair.cs
@@ -9,13 +9,16 @@ namespace Org.BouncyCastle.Asn1.Cmp
 	{
         public static CertifiedKeyPair GetInstance(object obj)
         {
+            if (obj == null)
+                return null;
             if (obj is CertifiedKeyPair certifiedKeyPair)
                 return certifiedKeyPair;
+            return new CertifiedKeyPair(Asn1Sequence.GetInstance(obj));
+        }
 
-            if (obj != null)
-                return new CertifiedKeyPair(Asn1Sequence.GetInstance(obj));
-
-            return null;
+        public static CertifiedKeyPair GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit)
+        {
+            return GetInstance(Asn1Sequence.GetInstance(taggedObject, declaredExplicit));
         }
 
         private readonly CertOrEncCert m_certOrEncCert;