diff options
Diffstat (limited to 'crypto/src/asn1/x509')
| -rw-r--r-- | crypto/src/asn1/x509/AuthorityInformationAccess.cs | 6 | ||||
| -rw-r--r-- | crypto/src/asn1/x509/ExtendedKeyUsage.cs | 4 | ||||
| -rw-r--r-- | crypto/src/asn1/x509/NameConstraints.cs | 10 | ||||
| -rw-r--r-- | crypto/src/asn1/x509/SubjectDirectoryAttributes.cs | 34 | ||||
| -rw-r--r-- | crypto/src/asn1/x509/SubjectPublicKeyInfo.cs | 1 | ||||
| -rw-r--r-- | crypto/src/asn1/x509/V2TBSCertListGenerator.cs | 2 | ||||
| -rw-r--r-- | crypto/src/asn1/x509/X509ExtensionsGenerator.cs | 2 |
7 files changed, 16 insertions, 43 deletions
diff --git a/crypto/src/asn1/x509/AuthorityInformationAccess.cs b/crypto/src/asn1/x509/AuthorityInformationAccess.cs index 382513674..c601322c5 100644 --- a/crypto/src/asn1/x509/AuthorityInformationAccess.cs +++ b/crypto/src/asn1/x509/AuthorityInformationAccess.cs @@ -1,8 +1,6 @@ using System; using System.Text; -using Org.BouncyCastle.Utilities; - namespace Org.BouncyCastle.Asn1.X509 { /** @@ -31,10 +29,10 @@ namespace Org.BouncyCastle.Asn1.X509 public static AuthorityInformationAccess GetInstance(object obj) { - if (obj is AuthorityInformationAccess) - return (AuthorityInformationAccess)obj; if (obj == null) return null; + if (obj is AuthorityInformationAccess authorityInformationAccess) + return authorityInformationAccess; return new AuthorityInformationAccess(Asn1Sequence.GetInstance(obj)); } diff --git a/crypto/src/asn1/x509/ExtendedKeyUsage.cs b/crypto/src/asn1/x509/ExtendedKeyUsage.cs index f812c308d..08962ab72 100644 --- a/crypto/src/asn1/x509/ExtendedKeyUsage.cs +++ b/crypto/src/asn1/x509/ExtendedKeyUsage.cs @@ -67,10 +67,8 @@ namespace Org.BouncyCastle.Asn1.X509 { Asn1EncodableVector v = new Asn1EncodableVector(); - foreach (object usage in usages) + foreach (var oid in usages) { - DerObjectIdentifier oid = DerObjectIdentifier.GetInstance(usage); - v.Add(oid); m_usageTable.Add(oid); } diff --git a/crypto/src/asn1/x509/NameConstraints.cs b/crypto/src/asn1/x509/NameConstraints.cs index 9fe4fdd01..590b14aa0 100644 --- a/crypto/src/asn1/x509/NameConstraints.cs +++ b/crypto/src/asn1/x509/NameConstraints.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using Org.BouncyCastle.Utilities; @@ -68,12 +69,7 @@ namespace Org.BouncyCastle.Asn1.X509 private DerSequence CreateSequence(IList<GeneralSubtree> subtrees) { - GeneralSubtree[] gsts = new GeneralSubtree[subtrees.Count]; - for (int i = 0; i < subtrees.Count; ++i) - { - gsts[i] = subtrees[i]; - } - return new DerSequence(gsts); + return new DerSequence(subtrees.ToArray()); } public Asn1Sequence PermittedSubtrees @@ -92,7 +88,7 @@ namespace Org.BouncyCastle.Asn1.X509 */ public override Asn1Object ToAsn1Object() { - Asn1EncodableVector v = new Asn1EncodableVector(); + Asn1EncodableVector v = new Asn1EncodableVector(2); v.AddOptionalTagged(false, 0, permitted); v.AddOptionalTagged(false, 1, excluded); return new DerSequence(v); diff --git a/crypto/src/asn1/x509/SubjectDirectoryAttributes.cs b/crypto/src/asn1/x509/SubjectDirectoryAttributes.cs index 6ebd35e21..c8f24ecd5 100644 --- a/crypto/src/asn1/x509/SubjectDirectoryAttributes.cs +++ b/crypto/src/asn1/x509/SubjectDirectoryAttributes.cs @@ -1,7 +1,5 @@ -using System; using System.Collections.Generic; -using Org.BouncyCastle.Utilities; using Org.BouncyCastle.Utilities.Collections; namespace Org.BouncyCastle.Asn1.X509 @@ -28,23 +26,16 @@ namespace Org.BouncyCastle.Asn1.X509 public class SubjectDirectoryAttributes : Asn1Encodable { - private readonly IList<AttributeX509> m_attributes; + private readonly List<AttributeX509> m_attributes; - public static SubjectDirectoryAttributes GetInstance( - object obj) - { - if (obj == null || obj is SubjectDirectoryAttributes) - { - return (SubjectDirectoryAttributes) obj; - } - - if (obj is Asn1Sequence) - { - return new SubjectDirectoryAttributes((Asn1Sequence) obj); - } - - throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(obj), "obj"); - } + public static SubjectDirectoryAttributes GetInstance(object obj) + { + if (obj == null) + return null; + if (obj is SubjectDirectoryAttributes subjectDirectoryAttributes) + return subjectDirectoryAttributes; + return new SubjectDirectoryAttributes(Asn1Sequence.GetInstance(obj)); + } /** * Constructor from Asn1Sequence. @@ -114,12 +105,7 @@ namespace Org.BouncyCastle.Asn1.X509 */ public override Asn1Object ToAsn1Object() { - AttributeX509[] v = new AttributeX509[m_attributes.Count]; - for (int i = 0; i < m_attributes.Count; ++i) - { - v[i] = m_attributes[i]; - } - return new DerSequence(v); + return new DerSequence(m_attributes.ToArray()); } /** diff --git a/crypto/src/asn1/x509/SubjectPublicKeyInfo.cs b/crypto/src/asn1/x509/SubjectPublicKeyInfo.cs index 52f977e91..4875152eb 100644 --- a/crypto/src/asn1/x509/SubjectPublicKeyInfo.cs +++ b/crypto/src/asn1/x509/SubjectPublicKeyInfo.cs @@ -1,5 +1,4 @@ using System; -using System.IO; namespace Org.BouncyCastle.Asn1.X509 { diff --git a/crypto/src/asn1/x509/V2TBSCertListGenerator.cs b/crypto/src/asn1/x509/V2TBSCertListGenerator.cs index aa1a0b95d..bf016c22d 100644 --- a/crypto/src/asn1/x509/V2TBSCertListGenerator.cs +++ b/crypto/src/asn1/x509/V2TBSCertListGenerator.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using System.IO; -using Org.BouncyCastle.Utilities; - namespace Org.BouncyCastle.Asn1.X509 { /** diff --git a/crypto/src/asn1/x509/X509ExtensionsGenerator.cs b/crypto/src/asn1/x509/X509ExtensionsGenerator.cs index 53d18ecff..7ea6084af 100644 --- a/crypto/src/asn1/x509/X509ExtensionsGenerator.cs +++ b/crypto/src/asn1/x509/X509ExtensionsGenerator.cs @@ -90,8 +90,6 @@ namespace Org.BouncyCastle.Asn1.X509 } } - - /// <summary>Return true if there are no extension present in this generator.</summary> /// <returns>True if empty, false otherwise</returns> public bool IsEmpty |