diff --git a/crypto/test/src/asn1/test/X509NameTest.cs b/crypto/test/src/asn1/test/X509NameTest.cs
index 7a0832c3e..9a564f72f 100644
--- a/crypto/test/src/asn1/test/X509NameTest.cs
+++ b/crypto/test/src/asn1/test/X509NameTest.cs
@@ -11,664 +11,664 @@ using Org.BouncyCastle.Utilities.Test;
namespace Org.BouncyCastle.Asn1.Tests
{
- [TestFixture]
- public class X509NameTest
- : SimpleTest
- {
- private static readonly string[] subjects =
- {
- "C=AU,ST=Victoria,L=South Melbourne,O=Connect 4 Pty Ltd,OU=Webserver Team,CN=www2.connect4.com.au,E=webmaster@connect4.com.au",
- "C=AU,ST=Victoria,L=South Melbourne,O=Connect 4 Pty Ltd,OU=Certificate Authority,CN=Connect 4 CA,E=webmaster@connect4.com.au",
- "C=AU,ST=QLD,CN=SSLeay/rsa test cert",
- "C=US,O=National Aeronautics and Space Administration,SERIALNUMBER=16+CN=Steve Schoch",
- "E=cooke@issl.atl.hp.com,C=US,OU=Hewlett Packard Company (ISSL),CN=Paul A. Cooke",
- "O=Sun Microsystems Inc,CN=store.sun.com",
- "unstructuredAddress=192.168.1.33,unstructuredName=pixfirewall.ciscopix.com,CN=pixfirewall.ciscopix.com"
- };
-
- public override string Name
- {
- get { return "X509Name"; }
- }
-
- private static X509Name FromBytes(
- byte[] bytes)
- {
- return X509Name.GetInstance(Asn1Object.FromByteArray(bytes));
- }
-
- private IAsn1Convertible createEntryValue(
- DerObjectIdentifier oid,
- string value)
- {
- IDictionary attrs = new Hashtable();
- attrs.Add(oid, value);
-
- IList ord = new ArrayList();
- ord.Add(oid);
-
- X509Name name = new X509Name(ord, attrs);
-
- Asn1Sequence seq = (Asn1Sequence)name.ToAsn1Object();
- Asn1Set set = (Asn1Set)seq[0];
- seq = (Asn1Sequence)set[0];
-
- return seq[1];
- }
-
- private IAsn1Convertible createEntryValueFromString(
- DerObjectIdentifier oid,
- string val)
- {
- IDictionary attrs = new Hashtable();
- attrs.Add(oid, val);
-
- IList ord = new ArrayList(attrs.Keys);
-
- X509Name name = new X509Name(new X509Name(ord, attrs).ToString());
-
- Asn1Sequence seq = (Asn1Sequence) name.ToAsn1Object();
- Asn1Set asn1Set = (Asn1Set) seq[0];
- seq = (Asn1Sequence) asn1Set[0];
-
- return seq[1];
- }
-
- private void doTestEncodingPrintableString(
- DerObjectIdentifier oid,
- string value)
- {
- IAsn1Convertible converted = createEntryValue(oid, value);
- if (!(converted is DerPrintableString))
- {
- Fail("encoding for " + oid + " not printable string");
- }
- }
-
- private void doTestEncodingIA5String(
- DerObjectIdentifier oid,
- string value)
- {
- IAsn1Convertible converted = createEntryValue(oid, value);
- if (!(converted is DerIA5String))
- {
- Fail("encoding for " + oid + " not IA5String");
- }
- }
-
- private void doTestEncodingGeneralizedTime(
- DerObjectIdentifier oid,
- string val)
- {
- IAsn1Convertible converted = createEntryValue(oid, val);
- if (!(converted is DerGeneralizedTime))
- {
- Fail("encoding for " + oid + " not GeneralizedTime");
- }
- converted = createEntryValueFromString(oid, val);
- if (!(converted is DerGeneralizedTime))
- {
- Fail("encoding for " + oid + " not GeneralizedTime");
- }
- }
-
- public override void PerformTest()
- {
- doTestEncodingPrintableString(X509Name.C, "AU");
- doTestEncodingPrintableString(X509Name.SerialNumber, "123456");
- doTestEncodingPrintableString(X509Name.DnQualifier, "123456");
- doTestEncodingIA5String(X509Name.EmailAddress, "test@test.com");
- doTestEncodingIA5String(X509Name.DC, "test");
- // correct encoding
- doTestEncodingGeneralizedTime(X509Name.DateOfBirth, "#180F32303032303132323132323232305A");
- // compatability encoding
- doTestEncodingGeneralizedTime(X509Name.DateOfBirth, "20020122122220Z");
-
- //
- // composite
- //
- IDictionary attrs = new Hashtable();
- attrs.Add(X509Name.C, "AU");
- attrs.Add(X509Name.O, "The Legion of the Bouncy Castle");
- attrs.Add(X509Name.L, "Melbourne");
- attrs.Add(X509Name.ST, "Victoria");
- attrs.Add(X509Name.E, "feedback-crypto@bouncycastle.org");
-
- IList order = new ArrayList();
- order.Add(X509Name.C);
- order.Add(X509Name.O);
- order.Add(X509Name.L);
- order.Add(X509Name.ST);
- order.Add(X509Name.E);
-
- X509Name name1 = new X509Name(order, attrs);
-
- if (!name1.Equivalent(name1))
- {
- Fail("Failed same object test");
- }
-
- if (!name1.Equivalent(name1, true))
- {
- Fail("Failed same object test - in Order");
- }
-
- X509Name name2 = new X509Name(order, attrs);
-
- if (!name1.Equivalent(name2))
- {
- Fail("Failed same name test");
- }
-
- if (!name1.Equivalent(name2, true))
- {
- Fail("Failed same name test - in Order");
- }
-
- if (name1.GetHashCode() != name2.GetHashCode())
- {
- Fail("Failed same name test - in Order");
- }
-
- IList ord1 = new ArrayList();
-
- ord1.Add(X509Name.C);
- ord1.Add(X509Name.O);
- ord1.Add(X509Name.L);
- ord1.Add(X509Name.ST);
- ord1.Add(X509Name.E);
-
- IList ord2 = new ArrayList();
-
- ord2.Add(X509Name.E);
- ord2.Add(X509Name.ST);
- ord2.Add(X509Name.L);
- ord2.Add(X509Name.O);
- ord2.Add(X509Name.C);
-
- name1 = new X509Name(ord1, attrs);
- name2 = new X509Name(ord2, attrs);
-
- if (!name1.Equivalent(name2))
- {
- Fail("Failed reverse name test");
- }
-
- // FIXME Sort out X509Name hashcode problem
+ [TestFixture]
+ public class X509NameTest
+ : SimpleTest
+ {
+ private static readonly string[] subjects =
+ {
+ "C=AU,ST=Victoria,L=South Melbourne,O=Connect 4 Pty Ltd,OU=Webserver Team,CN=www2.connect4.com.au,E=webmaster@connect4.com.au",
+ "C=AU,ST=Victoria,L=South Melbourne,O=Connect 4 Pty Ltd,OU=Certificate Authority,CN=Connect 4 CA,E=webmaster@connect4.com.au",
+ "C=AU,ST=QLD,CN=SSLeay/rsa test cert",
+ "C=US,O=National Aeronautics and Space Administration,SERIALNUMBER=16+CN=Steve Schoch",
+ "E=cooke@issl.atl.hp.com,C=US,OU=Hewlett Packard Company (ISSL),CN=Paul A. Cooke",
+ "O=Sun Microsystems Inc,CN=store.sun.com",
+ "unstructuredAddress=192.168.1.33,unstructuredName=pixfirewall.ciscopix.com,CN=pixfirewall.ciscopix.com"
+ };
+
+ public override string Name
+ {
+ get { return "X509Name"; }
+ }
+
+ private static X509Name FromBytes(
+ byte[] bytes)
+ {
+ return X509Name.GetInstance(Asn1Object.FromByteArray(bytes));
+ }
+
+ private IAsn1Convertible createEntryValue(
+ DerObjectIdentifier oid,
+ string value)
+ {
+ IDictionary attrs = new Hashtable();
+ attrs.Add(oid, value);
+
+ IList ord = new ArrayList();
+ ord.Add(oid);
+
+ X509Name name = new X509Name(ord, attrs);
+
+ Asn1Sequence seq = (Asn1Sequence)name.ToAsn1Object();
+ Asn1Set set = (Asn1Set)seq[0];
+ seq = (Asn1Sequence)set[0];
+
+ return seq[1];
+ }
+
+ private IAsn1Convertible createEntryValueFromString(
+ DerObjectIdentifier oid,
+ string val)
+ {
+ IDictionary attrs = new Hashtable();
+ attrs.Add(oid, val);
+
+ IList ord = new ArrayList(attrs.Keys);
+
+ X509Name name = new X509Name(new X509Name(ord, attrs).ToString());
+
+ Asn1Sequence seq = (Asn1Sequence) name.ToAsn1Object();
+ Asn1Set asn1Set = (Asn1Set) seq[0];
+ seq = (Asn1Sequence) asn1Set[0];
+
+ return seq[1];
+ }
+
+ private void doTestEncodingPrintableString(
+ DerObjectIdentifier oid,
+ string value)
+ {
+ IAsn1Convertible converted = createEntryValue(oid, value);
+ if (!(converted is DerPrintableString))
+ {
+ Fail("encoding for " + oid + " not printable string");
+ }
+ }
+
+ private void doTestEncodingIA5String(
+ DerObjectIdentifier oid,
+ string value)
+ {
+ IAsn1Convertible converted = createEntryValue(oid, value);
+ if (!(converted is DerIA5String))
+ {
+ Fail("encoding for " + oid + " not IA5String");
+ }
+ }
+
+ private void doTestEncodingGeneralizedTime(
+ DerObjectIdentifier oid,
+ string val)
+ {
+ IAsn1Convertible converted = createEntryValue(oid, val);
+ if (!(converted is DerGeneralizedTime))
+ {
+ Fail("encoding for " + oid + " not GeneralizedTime");
+ }
+ converted = createEntryValueFromString(oid, val);
+ if (!(converted is DerGeneralizedTime))
+ {
+ Fail("encoding for " + oid + " not GeneralizedTime");
+ }
+ }
+
+ public override void PerformTest()
+ {
+ doTestEncodingPrintableString(X509Name.C, "AU");
+ doTestEncodingPrintableString(X509Name.SerialNumber, "123456");
+ doTestEncodingPrintableString(X509Name.DnQualifier, "123456");
+ doTestEncodingIA5String(X509Name.EmailAddress, "test@test.com");
+ doTestEncodingIA5String(X509Name.DC, "test");
+ // correct encoding
+ doTestEncodingGeneralizedTime(X509Name.DateOfBirth, "#180F32303032303132323132323232305A");
+ // compatability encoding
+ doTestEncodingGeneralizedTime(X509Name.DateOfBirth, "20020122122220Z");
+
+ //
+ // composite
+ //
+ IDictionary attrs = new Hashtable();
+ attrs.Add(X509Name.C, "AU");
+ attrs.Add(X509Name.O, "The Legion of the Bouncy Castle");
+ attrs.Add(X509Name.L, "Melbourne");
+ attrs.Add(X509Name.ST, "Victoria");
+ attrs.Add(X509Name.E, "feedback-crypto@bouncycastle.org");
+
+ IList order = new ArrayList();
+ order.Add(X509Name.C);
+ order.Add(X509Name.O);
+ order.Add(X509Name.L);
+ order.Add(X509Name.ST);
+ order.Add(X509Name.E);
+
+ X509Name name1 = new X509Name(order, attrs);
+
+ if (!name1.Equivalent(name1))
+ {
+ Fail("Failed same object test");
+ }
+
+ if (!name1.Equivalent(name1, true))
+ {
+ Fail("Failed same object test - in Order");
+ }
+
+ X509Name name2 = new X509Name(order, attrs);
+
+ if (!name1.Equivalent(name2))
+ {
+ Fail("Failed same name test");
+ }
+
+ if (!name1.Equivalent(name2, true))
+ {
+ Fail("Failed same name test - in Order");
+ }
+
+ if (name1.GetHashCode() != name2.GetHashCode())
+ {
+ Fail("Failed same name test - in Order");
+ }
+
+ IList ord1 = new ArrayList();
+
+ ord1.Add(X509Name.C);
+ ord1.Add(X509Name.O);
+ ord1.Add(X509Name.L);
+ ord1.Add(X509Name.ST);
+ ord1.Add(X509Name.E);
+
+ IList ord2 = new ArrayList();
+
+ ord2.Add(X509Name.E);
+ ord2.Add(X509Name.ST);
+ ord2.Add(X509Name.L);
+ ord2.Add(X509Name.O);
+ ord2.Add(X509Name.C);
+
+ name1 = new X509Name(ord1, attrs);
+ name2 = new X509Name(ord2, attrs);
+
+ if (!name1.Equivalent(name2))
+ {
+ Fail("Failed reverse name test");
+ }
+
+ // FIXME Sort out X509Name hashcode problem
// if (name1.GetHashCode() != name2.GetHashCode())
// {
// Fail("Failed reverse name test GetHashCode");
// }
- if (name1.Equivalent(name2, true))
- {
- Fail("Failed reverse name test - in Order");
- }
+ if (name1.Equivalent(name2, true))
+ {
+ Fail("Failed reverse name test - in Order");
+ }
- if (!name1.Equivalent(name2, false))
- {
- Fail("Failed reverse name test - in Order false");
- }
+ if (!name1.Equivalent(name2, false))
+ {
+ Fail("Failed reverse name test - in Order false");
+ }
- IList oids = name1.GetOidList();
- if (!CompareVectors(oids, ord1))
- {
- Fail("oid comparison test");
- }
+ IList oids = name1.GetOidList();
+ if (!CompareVectors(oids, ord1))
+ {
+ Fail("oid comparison test");
+ }
- IList val1 = new ArrayList();
+ IList val1 = new ArrayList();
- val1.Add("AU");
- val1.Add("The Legion of the Bouncy Castle");
- val1.Add("Melbourne");
- val1.Add("Victoria");
- val1.Add("feedback-crypto@bouncycastle.org");
+ val1.Add("AU");
+ val1.Add("The Legion of the Bouncy Castle");
+ val1.Add("Melbourne");
+ val1.Add("Victoria");
+ val1.Add("feedback-crypto@bouncycastle.org");
- name1 = new X509Name(ord1, val1);
+ name1 = new X509Name(ord1, val1);
- IList values = name1.GetValueList();
- if (!CompareVectors(values, val1))
- {
- Fail("value comparison test");
- }
+ IList values = name1.GetValueList();
+ if (!CompareVectors(values, val1))
+ {
+ Fail("value comparison test");
+ }
- ord2 = new ArrayList();
+ ord2 = new ArrayList();
- ord2.Add(X509Name.ST);
- ord2.Add(X509Name.ST);
- ord2.Add(X509Name.L);
- ord2.Add(X509Name.O);
- ord2.Add(X509Name.C);
-
- name1 = new X509Name(ord1, attrs);
- name2 = new X509Name(ord2, attrs);
-
- if (name1.Equivalent(name2))
- {
- Fail("Failed different name test");
- }
-
- ord2 = new ArrayList();
+ ord2.Add(X509Name.ST);
+ ord2.Add(X509Name.ST);
+ ord2.Add(X509Name.L);
+ ord2.Add(X509Name.O);
+ ord2.Add(X509Name.C);
+
+ name1 = new X509Name(ord1, attrs);
+ name2 = new X509Name(ord2, attrs);
+
+ if (name1.Equivalent(name2))
+ {
+ Fail("Failed different name test");
+ }
+
+ ord2 = new ArrayList();
- ord2.Add(X509Name.ST);
- ord2.Add(X509Name.L);
- ord2.Add(X509Name.O);
- ord2.Add(X509Name.C);
-
- name1 = new X509Name(ord1, attrs);
- name2 = new X509Name(ord2, attrs);
+ ord2.Add(X509Name.ST);
+ ord2.Add(X509Name.L);
+ ord2.Add(X509Name.O);
+ ord2.Add(X509Name.C);
+
+ name1 = new X509Name(ord1, attrs);
+ name2 = new X509Name(ord2, attrs);
- if (name1.Equivalent(name2))
- {
- Fail("Failed subset name test");
- }
-
-
- compositeTest();
+ if (name1.Equivalent(name2))
+ {
+ Fail("Failed subset name test");
+ }
+
+
+ compositeTest();
- //
- // getValues test
- //
- ArrayList v1 = name1.GetValues(X509Name.O);
-
- if (v1.Count != 1 || !v1[0].Equals("The Legion of the Bouncy Castle"))
- {
- Fail("O test failed");
- }
+ //
+ // getValues test
+ //
+ IList v1 = name1.GetValueList(X509Name.O);
+
+ if (v1.Count != 1 || !v1[0].Equals("The Legion of the Bouncy Castle"))
+ {
+ Fail("O test failed");
+ }
- ArrayList v2 = name1.GetValues(X509Name.L);
-
- if (v2.Count != 1 || !v2[0].Equals("Melbourne"))
- {
- Fail("L test failed");
- }
-
- //
- // general subjects test
- //
- for (int i = 0; i != subjects.Length; i++)
- {
- X509Name name = new X509Name(subjects[i]);
- byte[] encodedName = name.GetEncoded();
- name = X509Name.GetInstance(Asn1Object.FromByteArray(encodedName));
-
- if (!name.ToString().Equals(subjects[i]))
- {
- Fail("Failed regeneration test " + i);
- }
- }
-
- //
- // sort test
- //
- X509Name unsorted = new X509Name("SERIALNUMBER=BBB + CN=AA");
-
- if (!FromBytes(unsorted.GetEncoded()).ToString().Equals("CN=AA+SERIALNUMBER=BBB"))
- {
- Fail("Failed sort test 1");
- }
+ IList v2 = name1.GetValueList(X509Name.L);
+
+ if (v2.Count != 1 || !v2[0].Equals("Melbourne"))
+ {
+ Fail("L test failed");
+ }
+
+ //
+ // general subjects test
+ //
+ for (int i = 0; i != subjects.Length; i++)
+ {
+ X509Name name = new X509Name(subjects[i]);
+ byte[] encodedName = name.GetEncoded();
+ name = X509Name.GetInstance(Asn1Object.FromByteArray(encodedName));
+
+ if (!name.ToString().Equals(subjects[i]))
+ {
+ Fail("Failed regeneration test " + i);
+ }
+ }
+
+ //
+ // sort test
+ //
+ X509Name unsorted = new X509Name("SERIALNUMBER=BBB + CN=AA");
+
+ if (!FromBytes(unsorted.GetEncoded()).ToString().Equals("CN=AA+SERIALNUMBER=BBB"))
+ {
+ Fail("Failed sort test 1");
+ }
- unsorted = new X509Name("CN=AA + SERIALNUMBER=BBB");
-
- if (!FromBytes(unsorted.GetEncoded()).ToString().Equals("CN=AA+SERIALNUMBER=BBB"))
- {
- Fail("Failed sort test 2");
- }
+ unsorted = new X509Name("CN=AA + SERIALNUMBER=BBB");
+
+ if (!FromBytes(unsorted.GetEncoded()).ToString().Equals("CN=AA+SERIALNUMBER=BBB"))
+ {
+ Fail("Failed sort test 2");
+ }
- unsorted = new X509Name("SERIALNUMBER=B + CN=AA");
+ unsorted = new X509Name("SERIALNUMBER=B + CN=AA");
- if (!FromBytes(unsorted.GetEncoded()).ToString().Equals("SERIALNUMBER=B+CN=AA"))
- {
- Fail("Failed sort test 3");
- }
+ if (!FromBytes(unsorted.GetEncoded()).ToString().Equals("SERIALNUMBER=B+CN=AA"))
+ {
+ Fail("Failed sort test 3");
+ }
- unsorted = new X509Name("CN=AA + SERIALNUMBER=B");
+ unsorted = new X509Name("CN=AA + SERIALNUMBER=B");
- if (!FromBytes(unsorted.GetEncoded()).ToString().Equals("SERIALNUMBER=B+CN=AA"))
- {
- Fail("Failed sort test 4");
- }
+ if (!FromBytes(unsorted.GetEncoded()).ToString().Equals("SERIALNUMBER=B+CN=AA"))
+ {
+ Fail("Failed sort test 4");
+ }
- //
- // equality tests
- //
- equalityTest(new X509Name("CN=The Legion"), new X509Name("CN=The Legion"));
- equalityTest(new X509Name("CN= The Legion"), new X509Name("CN=The Legion"));
- equalityTest(new X509Name("CN=The Legion "), new X509Name("CN=The Legion"));
- equalityTest(new X509Name("CN= The Legion "), new X509Name("CN=The Legion"));
- equalityTest(new X509Name("CN= the legion "), new X509Name("CN=The Legion"));
+ //
+ // equality tests
+ //
+ equalityTest(new X509Name("CN=The Legion"), new X509Name("CN=The Legion"));
+ equalityTest(new X509Name("CN= The Legion"), new X509Name("CN=The Legion"));
+ equalityTest(new X509Name("CN=The Legion "), new X509Name("CN=The Legion"));
+ equalityTest(new X509Name("CN= The Legion "), new X509Name("CN=The Legion"));
+ equalityTest(new X509Name("CN= the legion "), new X509Name("CN=The Legion"));
- // # test
+ // # test
- X509Name n1 = new X509Name("SERIALNUMBER=8,O=ABC,CN=ABC Class 3 CA,C=LT");
- X509Name n2 = new X509Name("2.5.4.5=8,O=ABC,CN=ABC Class 3 CA,C=LT");
- X509Name n3 = new X509Name("2.5.4.5=#130138,O=ABC,CN=ABC Class 3 CA,C=LT");
+ X509Name n1 = new X509Name("SERIALNUMBER=8,O=ABC,CN=ABC Class 3 CA,C=LT");
+ X509Name n2 = new X509Name("2.5.4.5=8,O=ABC,CN=ABC Class 3 CA,C=LT");
+ X509Name n3 = new X509Name("2.5.4.5=#130138,O=ABC,CN=ABC Class 3 CA,C=LT");
- equalityTest(n1, n2);
- equalityTest(n2, n3);
- equalityTest(n3, n1);
+ equalityTest(n1, n2);
+ equalityTest(n2, n3);
+ equalityTest(n3, n1);
- n1 = new X509Name(true, "2.5.4.5=#130138,CN=SSC Class 3 CA,O=UAB Skaitmeninio sertifikavimo centras,C=LT");
- n2 = new X509Name(true, "SERIALNUMBER=#130138,CN=SSC Class 3 CA,O=UAB Skaitmeninio sertifikavimo centras,C=LT");
- n3 = X509Name.GetInstance(Asn1Object.FromByteArray(Hex.Decode("3063310b3009060355040613024c54312f302d060355040a1326"
- + "55414220536b6169746d656e696e696f20736572746966696b6176696d6f2063656e74726173311730150603550403130e53534320436c6173732033204341310a30080603550405130138")));
+ n1 = new X509Name(true, "2.5.4.5=#130138,CN=SSC Class 3 CA,O=UAB Skaitmeninio sertifikavimo centras,C=LT");
+ n2 = new X509Name(true, "SERIALNUMBER=#130138,CN=SSC Class 3 CA,O=UAB Skaitmeninio sertifikavimo centras,C=LT");
+ n3 = X509Name.GetInstance(Asn1Object.FromByteArray(Hex.Decode("3063310b3009060355040613024c54312f302d060355040a1326"
+ + "55414220536b6169746d656e696e696f20736572746966696b6176696d6f2063656e74726173311730150603550403130e53534320436c6173732033204341310a30080603550405130138")));
- equalityTest(n1, n2);
- equalityTest(n2, n3);
- equalityTest(n3, n1);
+ equalityTest(n1, n2);
+ equalityTest(n2, n3);
+ equalityTest(n3, n1);
- n1 = new X509Name("SERIALNUMBER=8,O=XX,CN=ABC Class 3 CA,C=LT");
- n2 = new X509Name("2.5.4.5=8,O=,CN=ABC Class 3 CA,C=LT");
+ n1 = new X509Name("SERIALNUMBER=8,O=XX,CN=ABC Class 3 CA,C=LT");
+ n2 = new X509Name("2.5.4.5=8,O=,CN=ABC Class 3 CA,C=LT");
- if (n1.Equivalent(n2))
- {
- Fail("empty inequality check failed");
- }
-
- n1 = new X509Name("SERIALNUMBER=8,O=,CN=ABC Class 3 CA,C=LT");
- n2 = new X509Name("2.5.4.5=8,O=,CN=ABC Class 3 CA,C=LT");
-
- equalityTest(n1, n2);
-
- //
- // inequality to sequences
- //
- name1 = new X509Name("CN=The Legion");
-
- if (name1.Equals(DerSequence.Empty))
- {
- Fail("inequality test with sequence");
- }
-
- if (name1.Equals(new DerSequence(DerSet.Empty)))
- {
- Fail("inequality test with sequence and set");
- }
-
- Asn1EncodableVector v = new Asn1EncodableVector(
- new DerObjectIdentifier("1.1"),
- new DerObjectIdentifier("1.1"));
-
- if (name1.Equals(new DerSequence(new DerSet(new DerSet(v)))))
- {
- Fail("inequality test with sequence and bad set");
- }
+ if (n1.Equivalent(n2))
+ {
+ Fail("empty inequality check failed");
+ }
+
+ n1 = new X509Name("SERIALNUMBER=8,O=,CN=ABC Class 3 CA,C=LT");
+ n2 = new X509Name("2.5.4.5=8,O=,CN=ABC Class 3 CA,C=LT");
+
+ equalityTest(n1, n2);
+
+ //
+ // inequality to sequences
+ //
+ name1 = new X509Name("CN=The Legion");
+
+ if (name1.Equals(DerSequence.Empty))
+ {
+ Fail("inequality test with sequence");
+ }
+
+ if (name1.Equals(new DerSequence(DerSet.Empty)))
+ {
+ Fail("inequality test with sequence and set");
+ }
+
+ Asn1EncodableVector v = new Asn1EncodableVector(
+ new DerObjectIdentifier("1.1"),
+ new DerObjectIdentifier("1.1"));
+
+ if (name1.Equals(new DerSequence(new DerSet(new DerSet(v)))))
+ {
+ Fail("inequality test with sequence and bad set");
+ }
// if (name1.Equals(new DerSequence(new DerSet(new DerSet(v))), true))
// {
// Fail("inequality test with sequence and bad set");
// }
- try
- {
- X509Name.GetInstance(new DerSequence(new DerSet(new DerSet(v))));
- Fail("GetInstance should reject bad sequence");
- }
- catch (ArgumentException)
- {
- //expected
- }
-
- if (name1.Equals(new DerSequence(new DerSet(DerSequence.Empty))))
- {
- Fail("inequality test with sequence and short sequence");
- }
+ try
+ {
+ X509Name.GetInstance(new DerSequence(new DerSet(new DerSet(v))));
+ Fail("GetInstance should reject bad sequence");
+ }
+ catch (ArgumentException)
+ {
+ //expected
+ }
+
+ if (name1.Equals(new DerSequence(new DerSet(DerSequence.Empty))))
+ {
+ Fail("inequality test with sequence and short sequence");
+ }
// if (name1.Equals(new DerSequence(new DerSet(DerSequence.Empty)), true))
// {
// Fail("inequality test with sequence and short sequence");
// }
- try
- {
- X509Name.GetInstance(new DerSequence(new DerSet(DerSequence.Empty)));
- Fail("GetInstance should reject short sequence");
- }
- catch (ArgumentException)
- {
- //expected
- }
-
- v = new Asn1EncodableVector(
- new DerObjectIdentifier("1.1"),
- DerSequence.Empty);
-
- if (name1.Equals(new DerSequence(new DerSet(new DerSequence(v)))))
- {
- Fail("inequality test with sequence and bad sequence");
- }
-
- if (name1.Equivalent(null))
- {
- Fail("inequality test with null");
- }
-
- if (name1.Equivalent(null, true))
- {
- Fail("inequality test with null");
- }
-
- //
- // this is contrived but it checks sorting of sets with equal elements
- //
- unsorted = new X509Name("CN=AA + CN=AA + CN=AA");
-
- //
- // tagging test - only works if CHOICE implemented
- //
- /*
- ASN1TaggedObject tag = new DERTaggedObject(false, 1, new X509Name("CN=AA"));
-
- if (!tag.isExplicit())
- {
- Fail("failed to explicitly tag CHOICE object");
- }
-
- X509Name name = X509Name.getInstance(tag, false);
-
- if (!name.equals(new X509Name("CN=AA")))
- {
- Fail("failed to recover tagged name");
- }
- */
-
- DerUtf8String testString = new DerUtf8String("The Legion of the Bouncy Castle");
- byte[] encodedBytes = testString.GetEncoded();
- string hexEncodedString = "#" + Hex.ToHexString(encodedBytes);
-
- DerUtf8String converted = (DerUtf8String)
- new X509DefaultEntryConverter().GetConvertedValue(
- X509Name.L , hexEncodedString);
-
- if (!converted.Equals(testString))
- {
- Fail("Failed X509DefaultEntryConverter test");
- }
-
- //
- // try escaped.
- //
- converted = (DerUtf8String) new X509DefaultEntryConverter().GetConvertedValue(
- X509Name.L , "\\" + hexEncodedString);
-
- if (!converted.Equals(new DerUtf8String(hexEncodedString)))
- {
- Fail("Failed X509DefaultEntryConverter test got " + converted + " expected: " + hexEncodedString);
- }
-
- //
- // try a weird value
- //
- X509Name n = new X509Name("CN=\\#nothex#string");
-
- if (!n.ToString().Equals("CN=\\#nothex#string"))
- {
- Fail("# string not properly escaped.");
- }
-
- ArrayList vls = n.GetValues(X509Name.CN);
- if (vls.Count != 1 || !vls[0].Equals("#nothex#string"))
- {
- Fail("Escaped # not reduced properly");
- }
-
- n = new X509Name("CN=\"a+b\"");
-
- vls = n.GetValues(X509Name.CN);
- if (vls.Count != 1 || !vls[0].Equals("a+b"))
- {
- Fail("Escaped + not reduced properly");
- }
-
- n = new X509Name("CN=a\\+b");
-
- vls = n.GetValues(X509Name.CN);
- if (vls.Count != 1 || !vls[0].Equals("a+b"))
- {
- Fail("Escaped + not reduced properly");
- }
-
- if (!n.ToString().Equals("CN=a\\+b"))
- {
- Fail("+ in string not properly escaped.");
- }
-
- n = new X509Name("CN=a\\=b");
-
- vls = n.GetValues(X509Name.CN);
- if (vls.Count != 1 || !vls[0].Equals("a=b"))
- {
- Fail("Escaped = not reduced properly");
- }
-
- if (!n.ToString().Equals("CN=a\\=b"))
- {
- Fail("= in string not properly escaped.");
- }
-
- n = new X509Name("TELEPHONENUMBER=\"+61999999999\"");
-
- vls = n.GetValues(X509Name.TelephoneNumber);
- if (vls.Count != 1 || !vls[0].Equals("+61999999999"))
- {
- Fail("telephonenumber escaped + not reduced properly");
- }
-
- n = new X509Name("TELEPHONENUMBER=\\+61999999999");
-
- vls = n.GetValues(X509Name.TelephoneNumber);
- if (vls.Count != 1 || !vls[0].Equals("+61999999999"))
- {
- Fail("telephonenumber escaped + not reduced properly");
- }
-
- n = new X509Name(@"TELEPHONENUMBER=\+61999999999");
-
- vls = n.GetValues(X509Name.TelephoneNumber);
- if (vls.Count != 1 || !vls[0].Equals("+61999999999"))
- {
- Fail("telephonenumber escaped + not reduced properly");
- }
- }
-
- private void compositeTest()
- {
- //
- // composite test
- //
- byte[] enc = Hex.Decode("305e310b300906035504061302415531283026060355040a0c1f546865204c6567696f6e206f662074686520426f756e637920436173746c653125301006035504070c094d656c626f75726e653011060355040b0c0a4173636f742056616c65");
- X509Name n = X509Name.GetInstance(Asn1Object.FromByteArray(enc));
-
- if (!n.ToString().Equals("C=AU,O=The Legion of the Bouncy Castle,L=Melbourne+OU=Ascot Vale"))
- {
- Fail("Failed composite to string test got: " + n.ToString());
- }
+ try
+ {
+ X509Name.GetInstance(new DerSequence(new DerSet(DerSequence.Empty)));
+ Fail("GetInstance should reject short sequence");
+ }
+ catch (ArgumentException)
+ {
+ //expected
+ }
+
+ v = new Asn1EncodableVector(
+ new DerObjectIdentifier("1.1"),
+ DerSequence.Empty);
+
+ if (name1.Equals(new DerSequence(new DerSet(new DerSequence(v)))))
+ {
+ Fail("inequality test with sequence and bad sequence");
+ }
+
+ if (name1.Equivalent(null))
+ {
+ Fail("inequality test with null");
+ }
+
+ if (name1.Equivalent(null, true))
+ {
+ Fail("inequality test with null");
+ }
+
+ //
+ // this is contrived but it checks sorting of sets with equal elements
+ //
+ unsorted = new X509Name("CN=AA + CN=AA + CN=AA");
+
+ //
+ // tagging test - only works if CHOICE implemented
+ //
+ /*
+ ASN1TaggedObject tag = new DERTaggedObject(false, 1, new X509Name("CN=AA"));
+
+ if (!tag.isExplicit())
+ {
+ Fail("failed to explicitly tag CHOICE object");
+ }
+
+ X509Name name = X509Name.getInstance(tag, false);
+
+ if (!name.equals(new X509Name("CN=AA")))
+ {
+ Fail("failed to recover tagged name");
+ }
+ */
+
+ DerUtf8String testString = new DerUtf8String("The Legion of the Bouncy Castle");
+ byte[] encodedBytes = testString.GetEncoded();
+ string hexEncodedString = "#" + Hex.ToHexString(encodedBytes);
+
+ DerUtf8String converted = (DerUtf8String)
+ new X509DefaultEntryConverter().GetConvertedValue(
+ X509Name.L , hexEncodedString);
+
+ if (!converted.Equals(testString))
+ {
+ Fail("Failed X509DefaultEntryConverter test");
+ }
+
+ //
+ // try escaped.
+ //
+ converted = (DerUtf8String) new X509DefaultEntryConverter().GetConvertedValue(
+ X509Name.L , "\\" + hexEncodedString);
+
+ if (!converted.Equals(new DerUtf8String(hexEncodedString)))
+ {
+ Fail("Failed X509DefaultEntryConverter test got " + converted + " expected: " + hexEncodedString);
+ }
+
+ //
+ // try a weird value
+ //
+ X509Name n = new X509Name("CN=\\#nothex#string");
+
+ if (!n.ToString().Equals("CN=\\#nothex#string"))
+ {
+ Fail("# string not properly escaped.");
+ }
+
+ IList vls = n.GetValueList(X509Name.CN);
+ if (vls.Count != 1 || !vls[0].Equals("#nothex#string"))
+ {
+ Fail("Escaped # not reduced properly");
+ }
+
+ n = new X509Name("CN=\"a+b\"");
+
+ vls = n.GetValueList(X509Name.CN);
+ if (vls.Count != 1 || !vls[0].Equals("a+b"))
+ {
+ Fail("Escaped + not reduced properly");
+ }
+
+ n = new X509Name("CN=a\\+b");
+
+ vls = n.GetValueList(X509Name.CN);
+ if (vls.Count != 1 || !vls[0].Equals("a+b"))
+ {
+ Fail("Escaped + not reduced properly");
+ }
+
+ if (!n.ToString().Equals("CN=a\\+b"))
+ {
+ Fail("+ in string not properly escaped.");
+ }
+
+ n = new X509Name("CN=a\\=b");
+
+ vls = n.GetValueList(X509Name.CN);
+ if (vls.Count != 1 || !vls[0].Equals("a=b"))
+ {
+ Fail("Escaped = not reduced properly");
+ }
+
+ if (!n.ToString().Equals("CN=a\\=b"))
+ {
+ Fail("= in string not properly escaped.");
+ }
+
+ n = new X509Name("TELEPHONENUMBER=\"+61999999999\"");
+
+ vls = n.GetValueList(X509Name.TelephoneNumber);
+ if (vls.Count != 1 || !vls[0].Equals("+61999999999"))
+ {
+ Fail("telephonenumber escaped + not reduced properly");
+ }
+
+ n = new X509Name("TELEPHONENUMBER=\\+61999999999");
+
+ vls = n.GetValueList(X509Name.TelephoneNumber);
+ if (vls.Count != 1 || !vls[0].Equals("+61999999999"))
+ {
+ Fail("telephonenumber escaped + not reduced properly");
+ }
+
+ n = new X509Name(@"TELEPHONENUMBER=\+61999999999");
+
+ vls = n.GetValueList(X509Name.TelephoneNumber);
+ if (vls.Count != 1 || !vls[0].Equals("+61999999999"))
+ {
+ Fail("telephonenumber escaped + not reduced properly");
+ }
+ }
+
+ private void compositeTest()
+ {
+ //
+ // composite test
+ //
+ byte[] enc = Hex.Decode("305e310b300906035504061302415531283026060355040a0c1f546865204c6567696f6e206f662074686520426f756e637920436173746c653125301006035504070c094d656c626f75726e653011060355040b0c0a4173636f742056616c65");
+ X509Name n = X509Name.GetInstance(Asn1Object.FromByteArray(enc));
+
+ if (!n.ToString().Equals("C=AU,O=The Legion of the Bouncy Castle,L=Melbourne+OU=Ascot Vale"))
+ {
+ Fail("Failed composite to string test got: " + n.ToString());
+ }
IDictionary symbols = X509Name.DefaultSymbols;
- if (!n.ToString(true, symbols).Equals("L=Melbourne+OU=Ascot Vale,O=The Legion of the Bouncy Castle,C=AU"))
- {
+ if (!n.ToString(true, symbols).Equals("L=Melbourne+OU=Ascot Vale,O=The Legion of the Bouncy Castle,C=AU"))
+ {
Fail("Failed composite to string test got: " + n.ToString(true, symbols));
- }
+ }
- n = new X509Name(true, "L=Melbourne+OU=Ascot Vale,O=The Legion of the Bouncy Castle,C=AU");
- if (!n.ToString().Equals("C=AU,O=The Legion of the Bouncy Castle,L=Melbourne+OU=Ascot Vale"))
- {
- Fail("Failed composite to string reversal test got: " + n.ToString());
- }
+ n = new X509Name(true, "L=Melbourne+OU=Ascot Vale,O=The Legion of the Bouncy Castle,C=AU");
+ if (!n.ToString().Equals("C=AU,O=The Legion of the Bouncy Castle,L=Melbourne+OU=Ascot Vale"))
+ {
+ Fail("Failed composite to string reversal test got: " + n.ToString());
+ }
- n = new X509Name("C=AU, O=The Legion of the Bouncy Castle, L=Melbourne + OU=Ascot Vale");
+ n = new X509Name("C=AU, O=The Legion of the Bouncy Castle, L=Melbourne + OU=Ascot Vale");
- MemoryStream bOut = new MemoryStream();
- Asn1OutputStream aOut = new Asn1OutputStream(bOut);
+ MemoryStream bOut = new MemoryStream();
+ Asn1OutputStream aOut = new Asn1OutputStream(bOut);
- aOut.WriteObject(n);
+ aOut.WriteObject(n);
- byte[] enc2 = bOut.ToArray();
+ byte[] enc2 = bOut.ToArray();
- if (!Arrays.AreEqual(enc, enc2))
- {
- Fail("Failed composite string to encoding test");
- }
+ if (!Arrays.AreEqual(enc, enc2))
+ {
+ Fail("Failed composite string to encoding test");
+ }
- //
- // dud name test - handle empty DN without barfing.
- //
- n = new X509Name("C=CH,O=,OU=dummy,CN=mail@dummy.com");
+ //
+ // dud name test - handle empty DN without barfing.
+ //
+ n = new X509Name("C=CH,O=,OU=dummy,CN=mail@dummy.com");
- n = X509Name.GetInstance(Asn1Object.FromByteArray(n.GetEncoded()));
- }
+ n = X509Name.GetInstance(Asn1Object.FromByteArray(n.GetEncoded()));
+ }
- private void equalityTest(
- X509Name x509Name,
- X509Name x509Name1)
- {
- if (!x509Name.Equivalent(x509Name1))
- {
- Fail("equality test failed for " + x509Name + " : " + x509Name1);
- }
+ private void equalityTest(
+ X509Name x509Name,
+ X509Name x509Name1)
+ {
+ if (!x509Name.Equivalent(x509Name1))
+ {
+ Fail("equality test failed for " + x509Name + " : " + x509Name1);
+ }
- // FIXME Sort out X509Name hashcode problem
+ // FIXME Sort out X509Name hashcode problem
// if (x509Name.GetHashCode() != x509Name1.GetHashCode())
// {
// Fail("GetHashCode test failed for " + x509Name + " : " + x509Name1);
// }
- if (!x509Name.Equivalent(x509Name1, true))
- {
- Fail("equality test failed for " + x509Name + " : " + x509Name1);
- }
- }
-
- private bool CompareVectors(
- IList one,
- IList two)
- {
- if (one.Count != two.Count)
- return false;
-
- for (int i = 0; i < one.Count; ++i)
- {
- if (!one[i].Equals(two[i]))
- return false;
- }
-
- return true;
- }
-
- public static void Main(
- string[] args)
- {
- ITest test = new X509NameTest();
- ITestResult result = test.Perform();
-
- Console.WriteLine(result);
- }
-
- [Test]
- public void TestFunction()
- {
- string resultText = Perform().ToString();
-
- Assert.AreEqual(Name + ": Okay", resultText);
- }
- }
+ if (!x509Name.Equivalent(x509Name1, true))
+ {
+ Fail("equality test failed for " + x509Name + " : " + x509Name1);
+ }
+ }
+
+ private bool CompareVectors(
+ IList one,
+ IList two)
+ {
+ if (one.Count != two.Count)
+ return false;
+
+ for (int i = 0; i < one.Count; ++i)
+ {
+ if (!one[i].Equals(two[i]))
+ return false;
+ }
+
+ return true;
+ }
+
+ public static void Main(
+ string[] args)
+ {
+ ITest test = new X509NameTest();
+ ITestResult result = test.Perform();
+
+ Console.WriteLine(result);
+ }
+
+ [Test]
+ public void TestFunction()
+ {
+ string resultText = Perform().ToString();
+
+ Assert.AreEqual(Name + ": Okay", resultText);
+ }
+ }
}
|
