summary refs log tree commit diff
path: root/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'crypto')
-rw-r--r--crypto/src/asn1/anssi/ANSSIObjectIdentifiers.cs5
-rw-r--r--crypto/src/asn1/bc/BCObjectIdentifiers.cs2
-rw-r--r--crypto/src/asn1/crmf/CrmfObjectIdentifiers.cs1
-rw-r--r--crypto/src/asn1/cryptlib/CryptlibObjectIdentifiers.cs2
-rw-r--r--crypto/src/asn1/cryptopro/CryptoProObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/eac/EACObjectIdentifiers.cs5
-rw-r--r--crypto/src/asn1/edec/EdECObjectIdentifiers.cs1
-rw-r--r--crypto/src/asn1/gm/GMObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/gnu/GNUObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/iana/IANAObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/icao/ICAOObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/isismtt/ISISMTTObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/kisa/KISAObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/microsoft/MicrosoftObjectIdentifiers.cs1
-rw-r--r--crypto/src/asn1/misc/MiscObjectIdentifiers.cs1
-rw-r--r--crypto/src/asn1/nsri/NsriObjectIdentifiers.cs1
-rw-r--r--crypto/src/asn1/ntt/NTTObjectIdentifiers.cs5
-rw-r--r--crypto/src/asn1/ocsp/OCSPObjectIdentifiers.cs1
-rw-r--r--crypto/src/asn1/oiw/OIWObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/pkcs/PKCSObjectIdentifiers.cs1
-rw-r--r--crypto/src/asn1/rosstandart/RosstandartObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/sec/SECObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/teletrust/TeleTrusTObjectIdentifiers.cs3
-rw-r--r--crypto/src/asn1/ua/UAObjectIdentifiers.cs1
-rw-r--r--crypto/src/asn1/x509/X509ObjectIdentifiers.cs1
-rw-r--r--crypto/src/asn1/x9/X9ObjectIdentifiers.cs1
26 files changed, 40 insertions, 22 deletions
diff --git a/crypto/src/asn1/anssi/ANSSIObjectIdentifiers.cs b/crypto/src/asn1/anssi/ANSSIObjectIdentifiers.cs
index d230832b5..a169695d9 100644
--- a/crypto/src/asn1/anssi/ANSSIObjectIdentifiers.cs
+++ b/crypto/src/asn1/anssi/ANSSIObjectIdentifiers.cs
@@ -1,7 +1,6 @@
-using System;
-
-namespace Org.BouncyCastle.Asn1.Anssi
+namespace Org.BouncyCastle.Asn1.Anssi
 {
+    // TODO[api] Make static
     public sealed class AnssiObjectIdentifiers
     {
         private AnssiObjectIdentifiers()
diff --git a/crypto/src/asn1/bc/BCObjectIdentifiers.cs b/crypto/src/asn1/bc/BCObjectIdentifiers.cs
index 63e8b869b..fffbb1294 100644
--- a/crypto/src/asn1/bc/BCObjectIdentifiers.cs
+++ b/crypto/src/asn1/bc/BCObjectIdentifiers.cs
@@ -3,7 +3,7 @@ using System;
 namespace Org.BouncyCastle.Asn1.BC
 {
     // TODO[api] Make static
-	public abstract class BCObjectIdentifiers
+    public abstract class BCObjectIdentifiers
 	{
         /**
          * iso.org.dod.internet.private.enterprise.legion-of-the-bouncy-castle
diff --git a/crypto/src/asn1/crmf/CrmfObjectIdentifiers.cs b/crypto/src/asn1/crmf/CrmfObjectIdentifiers.cs
index eaa1f7ba4..b0b5edd98 100644
--- a/crypto/src/asn1/crmf/CrmfObjectIdentifiers.cs
+++ b/crypto/src/asn1/crmf/CrmfObjectIdentifiers.cs
@@ -4,6 +4,7 @@ using Org.BouncyCastle.Asn1.Pkcs;
 
 namespace Org.BouncyCastle.Asn1.Crmf
 {
+    // TODO[api] Make static
     public abstract class CrmfObjectIdentifiers
     {
         public static readonly DerObjectIdentifier id_pkix = new DerObjectIdentifier("1.3.6.1.5.5.7");
diff --git a/crypto/src/asn1/cryptlib/CryptlibObjectIdentifiers.cs b/crypto/src/asn1/cryptlib/CryptlibObjectIdentifiers.cs
index e7208bab2..b99ef84a1 100644
--- a/crypto/src/asn1/cryptlib/CryptlibObjectIdentifiers.cs
+++ b/crypto/src/asn1/cryptlib/CryptlibObjectIdentifiers.cs
@@ -1,6 +1,6 @@
 namespace Org.BouncyCastle.Asn1.Cryptlib
 {
-    internal class CryptlibObjectIdentifiers
+    internal static class CryptlibObjectIdentifiers
     {
         internal static readonly DerObjectIdentifier cryptlib = new DerObjectIdentifier("1.3.6.1.4.1.3029");
 
diff --git a/crypto/src/asn1/cryptopro/CryptoProObjectIdentifiers.cs b/crypto/src/asn1/cryptopro/CryptoProObjectIdentifiers.cs
index 12f369ba2..eaef444a0 100644
--- a/crypto/src/asn1/cryptopro/CryptoProObjectIdentifiers.cs
+++ b/crypto/src/asn1/cryptopro/CryptoProObjectIdentifiers.cs
@@ -1,9 +1,8 @@
 using System;
 
-using Org.BouncyCastle.Asn1;
-
 namespace Org.BouncyCastle.Asn1.CryptoPro
 {
+    // TODO[api] Make static
     public abstract class CryptoProObjectIdentifiers
     {
         // GOST Algorithms OBJECT IDENTIFIERS :
diff --git a/crypto/src/asn1/eac/EACObjectIdentifiers.cs b/crypto/src/asn1/eac/EACObjectIdentifiers.cs
index d54ef0eba..f9a938a9c 100644
--- a/crypto/src/asn1/eac/EACObjectIdentifiers.cs
+++ b/crypto/src/asn1/eac/EACObjectIdentifiers.cs
@@ -1,10 +1,9 @@
 using System;
 
-using Org.BouncyCastle.Asn1;
-
 namespace Org.BouncyCastle.Asn1.Eac
 {
-	public abstract class EacObjectIdentifiers
+    // TODO[api] Make static
+    public abstract class EacObjectIdentifiers
 	{
 		// bsi-de OBJECT IDENTIFIER ::= {
 		//         itu-t(0) identified-organization(4) etsi(0)
diff --git a/crypto/src/asn1/edec/EdECObjectIdentifiers.cs b/crypto/src/asn1/edec/EdECObjectIdentifiers.cs
index f8c5713d8..562fb88db 100644
--- a/crypto/src/asn1/edec/EdECObjectIdentifiers.cs
+++ b/crypto/src/asn1/edec/EdECObjectIdentifiers.cs
@@ -5,6 +5,7 @@ namespace Org.BouncyCastle.Asn1.EdEC
     /**
      * Edwards Elliptic Curve Object Identifiers (RFC 8410)
      */
+    // TODO[api] Make static
     public abstract class EdECObjectIdentifiers
     {
         public static readonly DerObjectIdentifier id_edwards_curve_algs = new DerObjectIdentifier("1.3.101");
diff --git a/crypto/src/asn1/gm/GMObjectIdentifiers.cs b/crypto/src/asn1/gm/GMObjectIdentifiers.cs
index edb3a41c5..a17a853f0 100644
--- a/crypto/src/asn1/gm/GMObjectIdentifiers.cs
+++ b/crypto/src/asn1/gm/GMObjectIdentifiers.cs
@@ -2,7 +2,8 @@ using System;
 
 namespace Org.BouncyCastle.Asn1.GM
 {
-	public abstract class GMObjectIdentifiers
+    // TODO[api] Make static
+    public abstract class GMObjectIdentifiers
 	{
         public static readonly DerObjectIdentifier sm_scheme = new DerObjectIdentifier("1.2.156.10197.1");
 
diff --git a/crypto/src/asn1/gnu/GNUObjectIdentifiers.cs b/crypto/src/asn1/gnu/GNUObjectIdentifiers.cs
index b322ef233..a6474eb3f 100644
--- a/crypto/src/asn1/gnu/GNUObjectIdentifiers.cs
+++ b/crypto/src/asn1/gnu/GNUObjectIdentifiers.cs
@@ -2,7 +2,8 @@ using System;
 
 namespace Org.BouncyCastle.Asn1.Gnu
 {
-	public abstract class GnuObjectIdentifiers
+    // TODO[api] Make static
+    public abstract class GnuObjectIdentifiers
 	{
 		public static readonly DerObjectIdentifier Gnu					= new DerObjectIdentifier("1.3.6.1.4.1.11591.1"); // GNU Radius
 		public static readonly DerObjectIdentifier GnuPG				= new DerObjectIdentifier("1.3.6.1.4.1.11591.2"); // GnuPG (Ägypten)
diff --git a/crypto/src/asn1/iana/IANAObjectIdentifiers.cs b/crypto/src/asn1/iana/IANAObjectIdentifiers.cs
index 63343f5ce..aea2aa20e 100644
--- a/crypto/src/asn1/iana/IANAObjectIdentifiers.cs
+++ b/crypto/src/asn1/iana/IANAObjectIdentifiers.cs
@@ -1,6 +1,7 @@
 namespace Org.BouncyCastle.Asn1.Iana
 {
-	public abstract class IanaObjectIdentifiers
+    // TODO[api] Make static
+    public abstract class IanaObjectIdentifiers
 	{
 		// id-SHA1 OBJECT IDENTIFIER ::=
 		// {iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) ipsec(8) isakmpOakley(1)}
diff --git a/crypto/src/asn1/icao/ICAOObjectIdentifiers.cs b/crypto/src/asn1/icao/ICAOObjectIdentifiers.cs
index 389d4dacd..b7848d9a4 100644
--- a/crypto/src/asn1/icao/ICAOObjectIdentifiers.cs
+++ b/crypto/src/asn1/icao/ICAOObjectIdentifiers.cs
@@ -2,7 +2,8 @@ using System;
 
 namespace Org.BouncyCastle.Asn1.Icao
 {
-	public abstract class IcaoObjectIdentifiers
+    // TODO[api] Make static
+    public abstract class IcaoObjectIdentifiers
 	{
 		//
 		// base id
diff --git a/crypto/src/asn1/isismtt/ISISMTTObjectIdentifiers.cs b/crypto/src/asn1/isismtt/ISISMTTObjectIdentifiers.cs
index af60b030a..3c65e0024 100644
--- a/crypto/src/asn1/isismtt/ISISMTTObjectIdentifiers.cs
+++ b/crypto/src/asn1/isismtt/ISISMTTObjectIdentifiers.cs
@@ -1,6 +1,7 @@
 namespace Org.BouncyCastle.Asn1.IsisMtt
 {
-	public abstract class IsisMttObjectIdentifiers
+    // TODO[api] Make static
+    public abstract class IsisMttObjectIdentifiers
 	{
 		public static readonly DerObjectIdentifier IdIsisMtt = new DerObjectIdentifier("1.3.36.8");
 
diff --git a/crypto/src/asn1/kisa/KISAObjectIdentifiers.cs b/crypto/src/asn1/kisa/KISAObjectIdentifiers.cs
index 05351ec75..d3fd38dec 100644
--- a/crypto/src/asn1/kisa/KISAObjectIdentifiers.cs
+++ b/crypto/src/asn1/kisa/KISAObjectIdentifiers.cs
@@ -1,6 +1,7 @@
 namespace Org.BouncyCastle.Asn1.Kisa
 {
-	public abstract class KisaObjectIdentifiers
+    // TODO[api] Make static
+    public abstract class KisaObjectIdentifiers
 	{
 		public static readonly DerObjectIdentifier IdSeedCbc = new DerObjectIdentifier("1.2.410.200004.1.4");
 		public static readonly DerObjectIdentifier IdNpkiAppCmsSeedWrap = new DerObjectIdentifier("1.2.410.200004.7.1.1.1");
diff --git a/crypto/src/asn1/microsoft/MicrosoftObjectIdentifiers.cs b/crypto/src/asn1/microsoft/MicrosoftObjectIdentifiers.cs
index bc48c3fa2..6d147bdd3 100644
--- a/crypto/src/asn1/microsoft/MicrosoftObjectIdentifiers.cs
+++ b/crypto/src/asn1/microsoft/MicrosoftObjectIdentifiers.cs
@@ -2,6 +2,7 @@ using System;
 
 namespace Org.BouncyCastle.Asn1.Microsoft
 {
+    // TODO[api] Make static
     public abstract class MicrosoftObjectIdentifiers
     {
         //
diff --git a/crypto/src/asn1/misc/MiscObjectIdentifiers.cs b/crypto/src/asn1/misc/MiscObjectIdentifiers.cs
index ebf107dd6..0b054f399 100644
--- a/crypto/src/asn1/misc/MiscObjectIdentifiers.cs
+++ b/crypto/src/asn1/misc/MiscObjectIdentifiers.cs
@@ -1,5 +1,6 @@
 namespace Org.BouncyCastle.Asn1.Misc
 {
+    // TODO[api] Make static
     public abstract class MiscObjectIdentifiers
     {
         //
diff --git a/crypto/src/asn1/nsri/NsriObjectIdentifiers.cs b/crypto/src/asn1/nsri/NsriObjectIdentifiers.cs
index 69d393fc6..2c558fa55 100644
--- a/crypto/src/asn1/nsri/NsriObjectIdentifiers.cs
+++ b/crypto/src/asn1/nsri/NsriObjectIdentifiers.cs
@@ -2,6 +2,7 @@
 
 namespace Org.BouncyCastle.Asn1.Nsri
 {
+    // TODO[api] Make static
     public sealed class NsriObjectIdentifiers
     {
         public static readonly DerObjectIdentifier nsri = new DerObjectIdentifier("1.2.410.200046");
diff --git a/crypto/src/asn1/ntt/NTTObjectIdentifiers.cs b/crypto/src/asn1/ntt/NTTObjectIdentifiers.cs
index cd2595600..1ce7ee2ab 100644
--- a/crypto/src/asn1/ntt/NTTObjectIdentifiers.cs
+++ b/crypto/src/asn1/ntt/NTTObjectIdentifiers.cs
@@ -1,7 +1,8 @@
 namespace Org.BouncyCastle.Asn1.Ntt
 {
-	/// <summary>From RFC 3657</summary>
-	public abstract class NttObjectIdentifiers
+    /// <summary>From RFC 3657</summary>
+    // TODO[api] Make static
+    public abstract class NttObjectIdentifiers
 	{
 		public static readonly DerObjectIdentifier IdCamellia128Cbc = new DerObjectIdentifier("1.2.392.200011.61.1.1.1.2");
 		public static readonly DerObjectIdentifier IdCamellia192Cbc = new DerObjectIdentifier("1.2.392.200011.61.1.1.1.3");
diff --git a/crypto/src/asn1/ocsp/OCSPObjectIdentifiers.cs b/crypto/src/asn1/ocsp/OCSPObjectIdentifiers.cs
index a37c8552d..3357002aa 100644
--- a/crypto/src/asn1/ocsp/OCSPObjectIdentifiers.cs
+++ b/crypto/src/asn1/ocsp/OCSPObjectIdentifiers.cs
@@ -2,6 +2,7 @@ using Org.BouncyCastle.Asn1;
 
 namespace Org.BouncyCastle.Asn1.Ocsp
 {
+    // TODO[api] Make static
     public abstract class OcspObjectIdentifiers
     {
         internal const string PkixOcspId = "1.3.6.1.5.5.7.48.1";
diff --git a/crypto/src/asn1/oiw/OIWObjectIdentifiers.cs b/crypto/src/asn1/oiw/OIWObjectIdentifiers.cs
index 3da226301..ea6f49b67 100644
--- a/crypto/src/asn1/oiw/OIWObjectIdentifiers.cs
+++ b/crypto/src/asn1/oiw/OIWObjectIdentifiers.cs
@@ -1,6 +1,7 @@
 namespace Org.BouncyCastle.Asn1.Oiw
 {
-	public abstract class OiwObjectIdentifiers
+    // TODO[api] Make static
+    public abstract class OiwObjectIdentifiers
 	{
 		public static readonly DerObjectIdentifier MD4WithRsa			= new DerObjectIdentifier("1.3.14.3.2.2");
 		public static readonly DerObjectIdentifier MD5WithRsa			= new DerObjectIdentifier("1.3.14.3.2.3");
diff --git a/crypto/src/asn1/pkcs/PKCSObjectIdentifiers.cs b/crypto/src/asn1/pkcs/PKCSObjectIdentifiers.cs
index 5d5f67127..77b028ac1 100644
--- a/crypto/src/asn1/pkcs/PKCSObjectIdentifiers.cs
+++ b/crypto/src/asn1/pkcs/PKCSObjectIdentifiers.cs
@@ -2,6 +2,7 @@ using System;
 
 namespace Org.BouncyCastle.Asn1.Pkcs
 {
+    // TODO[api] Make static
     public abstract class PkcsObjectIdentifiers
     {
         //
diff --git a/crypto/src/asn1/rosstandart/RosstandartObjectIdentifiers.cs b/crypto/src/asn1/rosstandart/RosstandartObjectIdentifiers.cs
index 86fedb7bb..45eaaa6e3 100644
--- a/crypto/src/asn1/rosstandart/RosstandartObjectIdentifiers.cs
+++ b/crypto/src/asn1/rosstandart/RosstandartObjectIdentifiers.cs
@@ -2,7 +2,8 @@
 
 namespace Org.BouncyCastle.Asn1.Rosstandart
 {
-	public abstract class RosstandartObjectIdentifiers
+    // TODO[api] Make static
+    public abstract class RosstandartObjectIdentifiers
     {
         public static readonly DerObjectIdentifier rosstandart = new DerObjectIdentifier("1.2.643.7");
 
diff --git a/crypto/src/asn1/sec/SECObjectIdentifiers.cs b/crypto/src/asn1/sec/SECObjectIdentifiers.cs
index 183f01916..76a7aefe7 100644
--- a/crypto/src/asn1/sec/SECObjectIdentifiers.cs
+++ b/crypto/src/asn1/sec/SECObjectIdentifiers.cs
@@ -5,7 +5,8 @@ using Org.BouncyCastle.Asn1.X9;
 
 namespace Org.BouncyCastle.Asn1.Sec
 {
-	public abstract class SecObjectIdentifiers
+    // TODO[api] Make static
+    public abstract class SecObjectIdentifiers
 	{
 		/**
 		 *  EllipticCurve OBJECT IDENTIFIER ::= {
diff --git a/crypto/src/asn1/teletrust/TeleTrusTObjectIdentifiers.cs b/crypto/src/asn1/teletrust/TeleTrusTObjectIdentifiers.cs
index 56e70842a..9ebdbecee 100644
--- a/crypto/src/asn1/teletrust/TeleTrusTObjectIdentifiers.cs
+++ b/crypto/src/asn1/teletrust/TeleTrusTObjectIdentifiers.cs
@@ -1,6 +1,7 @@
 namespace Org.BouncyCastle.Asn1.TeleTrust
 {
-	public sealed class TeleTrusTObjectIdentifiers
+    // TODO[api] Make static
+    public sealed class TeleTrusTObjectIdentifiers
 	{
 		private TeleTrusTObjectIdentifiers()
 		{
diff --git a/crypto/src/asn1/ua/UAObjectIdentifiers.cs b/crypto/src/asn1/ua/UAObjectIdentifiers.cs
index 4c996c4f4..41bcec0b7 100644
--- a/crypto/src/asn1/ua/UAObjectIdentifiers.cs
+++ b/crypto/src/asn1/ua/UAObjectIdentifiers.cs
@@ -9,6 +9,7 @@
      * <p/>
      * DSTU4145 in polynomial basis has 2 oids, one for little-endian representation and one for big-endian
      */
+    // TODO[api] Make static
     public abstract class UAObjectIdentifiers
     {
         /** Base OID: 1.2.804.2.1.1.1 */
diff --git a/crypto/src/asn1/x509/X509ObjectIdentifiers.cs b/crypto/src/asn1/x509/X509ObjectIdentifiers.cs
index 4df5bba69..2010cc5a2 100644
--- a/crypto/src/asn1/x509/X509ObjectIdentifiers.cs
+++ b/crypto/src/asn1/x509/X509ObjectIdentifiers.cs
@@ -1,5 +1,6 @@
 namespace Org.BouncyCastle.Asn1.X509
 {
+    // TODO[api] Make static
     public abstract class X509ObjectIdentifiers
     {
         //
diff --git a/crypto/src/asn1/x9/X9ObjectIdentifiers.cs b/crypto/src/asn1/x9/X9ObjectIdentifiers.cs
index 11b94e8d6..1595bf1ba 100644
--- a/crypto/src/asn1/x9/X9ObjectIdentifiers.cs
+++ b/crypto/src/asn1/x9/X9ObjectIdentifiers.cs
@@ -2,6 +2,7 @@ using System;
 
 namespace Org.BouncyCastle.Asn1.X9
 {
+    // TODO[api] Make static
     public abstract class X9ObjectIdentifiers
     {
         //