From daec40507f75c8bbe80f54e25338d31a2b411e39 Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Wed, 12 Jun 2024 18:09:06 +0700 Subject: DerInteger constants for small values --- crypto/test/src/asn1/test/GenerationTest.cs | 16 ++++++++-------- crypto/test/src/asn1/test/OctetStringTest.cs | 2 +- crypto/test/src/asn1/test/OtherCertIDUnitTest.cs | 2 +- crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs | 2 +- crypto/test/src/asn1/test/TagTest.cs | 2 +- crypto/test/src/tsp/test/GenTimeAccuracyTest.cs | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'crypto/test') diff --git a/crypto/test/src/asn1/test/GenerationTest.cs b/crypto/test/src/asn1/test/GenerationTest.cs index 3a0fae8e7..4f4b70c58 100644 --- a/crypto/test/src/asn1/test/GenerationTest.cs +++ b/crypto/test/src/asn1/test/GenerationTest.cs @@ -54,7 +54,7 @@ namespace Org.BouncyCastle.Asn1.Tests DateTime startDate = MakeUtcDateTime(1970, 1, 1, 0, 0, 1); DateTime endDate = MakeUtcDateTime(1970, 1, 1, 0, 0, 12); - gen.SetSerialNumber(new DerInteger(1)); + gen.SetSerialNumber(DerInteger.One); gen.SetStartDate(new Time(startDate)); gen.SetEndDate(new Time(endDate)); @@ -107,7 +107,7 @@ namespace Org.BouncyCastle.Asn1.Tests DateTime startDate = MakeUtcDateTime(1970, 1, 1, 0, 0, 1); DateTime endDate = MakeUtcDateTime(1970, 1, 1, 0, 0, 2); - gen.SetSerialNumber(new DerInteger(2)); + gen.SetSerialNumber(DerInteger.Two); gen.SetStartDate(new Time(startDate)); gen.SetEndDate(new Time(endDate)); @@ -121,7 +121,7 @@ namespace Org.BouncyCastle.Asn1.Tests new AlgorithmIdentifier( OiwObjectIdentifiers.ElGamalAlgorithm, new ElGamalParameter(BigInteger.One, BigInteger.Two)), - new DerInteger(3)); + DerInteger.Three); gen.SetSubjectPublicKeyInfo(info); @@ -167,7 +167,7 @@ namespace Org.BouncyCastle.Asn1.Tests DateTime startDate = MakeUtcDateTime(1970, 1, 1, 0, 0, 1); DateTime endDate = MakeUtcDateTime(1970, 1, 1, 0, 0, 2); - gen.SetSerialNumber(new DerInteger(2)); + gen.SetSerialNumber(DerInteger.Two); gen.SetStartDate(new Time(startDate)); gen.SetEndDate(new Time(endDate)); @@ -179,7 +179,7 @@ namespace Org.BouncyCastle.Asn1.Tests SubjectPublicKeyInfo info = new SubjectPublicKeyInfo( new AlgorithmIdentifier(OiwObjectIdentifiers.ElGamalAlgorithm, new ElGamalParameter(BigInteger.One, BigInteger.Two)), - new DerInteger(3)); + DerInteger.Three); gen.SetSubjectPublicKeyInfo(info); @@ -241,7 +241,7 @@ namespace Org.BouncyCastle.Asn1.Tests gen.SetIssuer(new X509Name("CN=AU,O=Bouncy Castle")); - gen.AddCrlEntry(new DerInteger(1), new Time(MakeUtcDateTime(1970, 1, 1, 0, 0, 1)), ReasonFlags.AACompromise); + gen.AddCrlEntry(DerInteger.One, new Time(MakeUtcDateTime(1970, 1, 1, 0, 0, 1)), ReasonFlags.AACompromise); gen.SetNextUpdate(new Time(MakeUtcDateTime(1970, 1, 1, 0, 0, 2))); @@ -259,7 +259,7 @@ namespace Org.BouncyCastle.Asn1.Tests new AlgorithmIdentifier( OiwObjectIdentifiers.ElGamalAlgorithm, new ElGamalParameter(BigInteger.One, BigInteger.Two)), - new DerInteger(3)); + DerInteger.Three); order.Add(X509Extensions.AuthorityKeyIdentifier); order.Add(X509Extensions.IssuerAlternativeName); @@ -268,7 +268,7 @@ namespace Org.BouncyCastle.Asn1.Tests extensions.Add(X509Extensions.AuthorityKeyIdentifier, new X509Extension(true, new DerOctetString(CreateAuthorityKeyId(info, new X509Name("CN=AU,O=Bouncy Castle,OU=Test 2"), 2)))); extensions.Add(X509Extensions.IssuerAlternativeName, new X509Extension(false, new DerOctetString(GeneralNames.GetInstance(new DerSequence(new GeneralName(new X509Name("CN=AU,O=Bouncy Castle,OU=Test 3"))))))); - extensions.Add(X509Extensions.CrlNumber, new X509Extension(false, new DerOctetString(new DerInteger(1)))); + extensions.Add(X509Extensions.CrlNumber, new X509Extension(false, new DerOctetString(DerInteger.One))); extensions.Add(X509Extensions.IssuingDistributionPoint, new X509Extension(true, new DerOctetString(IssuingDistributionPoint.GetInstance(DerSequence.Empty)))); X509Extensions ex = new X509Extensions(order, extensions); diff --git a/crypto/test/src/asn1/test/OctetStringTest.cs b/crypto/test/src/asn1/test/OctetStringTest.cs index 959d16c32..a0a97756b 100644 --- a/crypto/test/src/asn1/test/OctetStringTest.cs +++ b/crypto/test/src/asn1/test/OctetStringTest.cs @@ -125,7 +125,7 @@ namespace Org.BouncyCastle.Asn1.Tests using (var cGen = new BerSequenceGenerator(sGen.GetRawOutputStream(), 0, true)) { - cGen.AddObject(new DerInteger(0)); + cGen.AddObject(DerInteger.Zero); // // AlgorithmIdentifier diff --git a/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs b/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs index 784df4146..395671c68 100644 --- a/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs +++ b/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs @@ -21,7 +21,7 @@ namespace Org.BouncyCastle.Asn1.Tests AlgorithmIdentifier algId = new AlgorithmIdentifier(new DerObjectIdentifier("1.2.2.3")); byte[] digest = new byte[20]; OtherHash otherHash = new OtherHash(new OtherHashAlgAndValue(algId, digest)); - IssuerSerial issuerSerial = new IssuerSerial(new GeneralNames(new GeneralName(new X509Name("CN=test"))), new DerInteger(1)); + IssuerSerial issuerSerial = new IssuerSerial(new GeneralNames(new GeneralName(new X509Name("CN=test"))), DerInteger.One); OtherCertID certID = new OtherCertID(otherHash); diff --git a/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs b/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs index 4a68cdb9d..eef402c48 100644 --- a/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs +++ b/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs @@ -22,7 +22,7 @@ namespace Org.BouncyCastle.Asn1.Tests string country = "AU"; DirectoryString typeOfSubstitution = new DirectoryString("substitution"); GeneralName thirdPerson = new GeneralName(new X509Name("CN=thirdPerson")); - IssuerSerial certRef = new IssuerSerial(new GeneralNames(new GeneralName(new X509Name("CN=test"))), new DerInteger(1)); + IssuerSerial certRef = new IssuerSerial(new GeneralNames(new GeneralName(new X509Name("CN=test"))), DerInteger.One); ProcurationSyntax procuration = new ProcurationSyntax(country, typeOfSubstitution, thirdPerson); diff --git a/crypto/test/src/asn1/test/TagTest.cs b/crypto/test/src/asn1/test/TagTest.cs index e2f84dfb5..004893d25 100644 --- a/crypto/test/src/asn1/test/TagTest.cs +++ b/crypto/test/src/asn1/test/TagTest.cs @@ -103,7 +103,7 @@ namespace Org.BouncyCastle.Asn1.Tests } } - tagged = new DerTaggedObject(false, 34, new DerTaggedObject(true, 1000, new DerInteger(1))); + tagged = new DerTaggedObject(false, 34, new DerTaggedObject(true, 1000, DerInteger.One)); if (!AreEqual(taggedInteger, tagged.GetEncoded())) { Fail("incorrect encoding for implicit explicit tagged integer"); diff --git a/crypto/test/src/tsp/test/GenTimeAccuracyTest.cs b/crypto/test/src/tsp/test/GenTimeAccuracyTest.cs index 01cc83d53..7f98f8167 100644 --- a/crypto/test/src/tsp/test/GenTimeAccuracyTest.cs +++ b/crypto/test/src/tsp/test/GenTimeAccuracyTest.cs @@ -10,10 +10,10 @@ namespace Org.BouncyCastle.Tsp.Tests [TestFixture] public class GenTimeAccuracyUnitTest { - private static readonly DerInteger ZERO_VALUE = new DerInteger(0); - private static readonly DerInteger ONE_VALUE = new DerInteger(1); - private static readonly DerInteger TWO_VALUE = new DerInteger(2); - private static readonly DerInteger THREE_VALUE = new DerInteger(3); + private static readonly DerInteger ZERO_VALUE = DerInteger.Zero; + private static readonly DerInteger ONE_VALUE = DerInteger.One; + private static readonly DerInteger TWO_VALUE = DerInteger.Two; + private static readonly DerInteger THREE_VALUE = DerInteger.Three; [Test] public void TestOneTwoThree() -- cgit 1.4.1