diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2023-07-18 12:06:03 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2023-07-18 12:06:03 +0700 |
| commit | 913eada3ad9394f1327a1feb80a3261f7c6e55bb (patch) | |
| tree | 6366c1e196ad2ac249edf12a4d41d52ee2d28629 /crypto/src/asn1/ocsp | |
| parent | Refactoring around PrivateKeyInfo (diff) | |
| download | BouncyCastle.NET-ed25519-913eada3ad9394f1327a1feb80a3261f7c6e55bb.tar.xz | |
Deprecated Asn1TaggedObject.GetObject and refactor
Diffstat (limited to 'crypto/src/asn1/ocsp')
| -rw-r--r-- | crypto/src/asn1/ocsp/CertStatus.cs | 5 | ||||
| -rw-r--r-- | crypto/src/asn1/ocsp/ResponderID.cs | 20 |
2 files changed, 13 insertions, 12 deletions
diff --git a/crypto/src/asn1/ocsp/CertStatus.cs b/crypto/src/asn1/ocsp/CertStatus.cs index 65f11fc7f..18b7bd21c 100644 --- a/crypto/src/asn1/ocsp/CertStatus.cs +++ b/crypto/src/asn1/ocsp/CertStatus.cs @@ -68,6 +68,11 @@ namespace Org.BouncyCastle.Asn1.Ocsp throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(obj), "obj"); } + public static CertStatus GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit) + { + return Asn1Utilities.GetInstanceFromChoice(taggedObject, declaredExplicit, GetInstance); + } + public int TagNo { get { return tagNo; } diff --git a/crypto/src/asn1/ocsp/ResponderID.cs b/crypto/src/asn1/ocsp/ResponderID.cs index bc8b7f731..d677e63b0 100644 --- a/crypto/src/asn1/ocsp/ResponderID.cs +++ b/crypto/src/asn1/ocsp/ResponderID.cs @@ -33,7 +33,12 @@ namespace Org.BouncyCastle.Asn1.Ocsp return new ResponderID(X509Name.GetInstance(obj)); } - public ResponderID( + public static ResponderID GetInstance(Asn1TaggedObject obj, bool isExplicit) + { + return Asn1Utilities.GetInstanceFromChoice(obj, isExplicit, GetInstance); + } + + public ResponderID( Asn1OctetString id) { if (id == null) @@ -51,19 +56,10 @@ namespace Org.BouncyCastle.Asn1.Ocsp this.id = id; } - public static ResponderID GetInstance( - Asn1TaggedObject obj, - bool isExplicit) - { - return GetInstance(obj.GetObject()); // must be explicitly tagged - } - public virtual byte[] GetKeyHash() { - if (id is Asn1OctetString) - { - return ((Asn1OctetString)id).GetOctets(); - } + if (id is Asn1OctetString octetString) + return octetString.GetOctets(); return null; } |