From 29df93849fe023828abf29d3c5151a62d88f69eb Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Thu, 18 Jan 2024 19:46:12 +0700 Subject: Refactoring in DerObjectIdentifier --- crypto/src/asn1/DerObjectIdentifier.cs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/crypto/src/asn1/DerObjectIdentifier.cs b/crypto/src/asn1/DerObjectIdentifier.cs index 7d45c9cb8..04792cbdd 100644 --- a/crypto/src/asn1/DerObjectIdentifier.cs +++ b/crypto/src/asn1/DerObjectIdentifier.cs @@ -114,15 +114,6 @@ namespace Org.BouncyCastle.Asn1 m_identifier = identifier; } - private DerObjectIdentifier(DerObjectIdentifier oid, string branchID) - { - if (!Asn1RelativeOid.IsValidIdentifier(branchID, 0)) - throw new FormatException("string " + branchID + " not a valid OID branch"); - - m_contents = Arrays.Concatenate(oid.m_contents, Asn1RelativeOid.ParseIdentifier(branchID)); - m_identifier = oid.GetID() + "." + branchID; - } - private DerObjectIdentifier(byte[] contents, bool clone) { if (!Asn1RelativeOid.IsValidContents(contents)) @@ -140,7 +131,12 @@ namespace Org.BouncyCastle.Asn1 public virtual DerObjectIdentifier Branch(string branchID) { - return new DerObjectIdentifier(this, branchID); + if (!Asn1RelativeOid.IsValidIdentifier(branchID, 0)) + throw new FormatException("string " + branchID + " not a valid OID branch"); + + return new DerObjectIdentifier( + contents: Arrays.Concatenate(m_contents, Asn1RelativeOid.ParseIdentifier(branchID)), + identifier: GetID() + "." + branchID); } public string GetID() -- cgit 1.4.1