Fixes and tidying up for release

1 files changed, 152 insertions, 155 deletions

diff --git a/crypto/test/src/cmp/test/ProtectedMessageTest.cs b/crypto/test/src/cmp/test/ProtectedMessageTest.cs
index 24f2fe572..70bf670da 100644
--- a/crypto/test/src/cmp/test/ProtectedMessageTest.cs
+++ b/crypto/test/src/cmp/test/ProtectedMessageTest.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 
 using NUnit.Framework;
+
 using Org.BouncyCastle.Asn1;
 using Org.BouncyCastle.Asn1.Cmp;
 using Org.BouncyCastle.Asn1.Crmf;
@@ -25,7 +26,7 @@ namespace Org.BouncyCastle.Cmp.Tests
     {
         public override string Name
         {
-            get { return "ProtectedMessageTest"; }
+            get { return "ProtectedMessage"; }
         }
 
         public override void PerformTest()
@@ -35,35 +36,35 @@ namespace Org.BouncyCastle.Cmp.Tests
             TestMacProtectedMessage();
             TestProtectedMessage();
             TestConfirmationMessage();
-            TestSampleCr();        
+            TestSampleCr();
         }
 
-//        [Test]
-//        public void TestServerSideKey()
-//        {
-//            RsaKeyPairGenerator rsaKeyPairGenerator = new RsaKeyPairGenerator();
-//            rsaKeyPairGenerator.Init(new RsaKeyGenerationParameters(BigInteger.ValueOf(65537), new SecureRandom(), 2048, 100));
-//            AsymmetricCipherKeyPair rsaKeyPair = rsaKeyPairGenerator.GenerateKeyPair();
-//
-//            TestCertBuilder builder = new TestCertBuilder()
-//            {
-//                Issuer = new X509Name("CN=Test"),
-//                Subject =  new X509Name("CN=Test"),
-//                NotBefore = DateTime.UtcNow.AddDays(-1),
-//                NotAfter = DateTime.UtcNow.AddDays(1),
-//                PublicKey = rsaKeyPair.Public,
-//                SignatureAlgorithm = "MD5WithRSAEncryption"
-//            };
-//
-//            builder.AddAttribute(X509Name.C, "Foo");
-//            X509Certificate cert = builder.Build(rsaKeyPair.Private);
-//               
-//            GeneralName sender = new GeneralName(new X509Name("CN=Sender"));
-//            GeneralName recipient = new GeneralName(new X509Name("CN=Recip"));
-//
-//            
-//
-//        }
+        //        [Test]
+        //        public void TestServerSideKey()
+        //        {
+        //            RsaKeyPairGenerator rsaKeyPairGenerator = new RsaKeyPairGenerator();
+        //            rsaKeyPairGenerator.Init(new RsaKeyGenerationParameters(BigInteger.ValueOf(65537), new SecureRandom(), 2048, 100));
+        //            AsymmetricCipherKeyPair rsaKeyPair = rsaKeyPairGenerator.GenerateKeyPair();
+        //
+        //            TestCertBuilder builder = new TestCertBuilder()
+        //            {
+        //                Issuer = new X509Name("CN=Test"),
+        //                Subject =  new X509Name("CN=Test"),
+        //                NotBefore = DateTime.UtcNow.AddDays(-1),
+        //                NotAfter = DateTime.UtcNow.AddDays(1),
+        //                PublicKey = rsaKeyPair.Public,
+        //                SignatureAlgorithm = "MD5WithRSAEncryption"
+        //            };
+        //
+        //            builder.AddAttribute(X509Name.C, "Foo");
+        //            X509Certificate cert = builder.Build(rsaKeyPair.Private);
+        //               
+        //            GeneralName sender = new GeneralName(new X509Name("CN=Sender"));
+        //            GeneralName recipient = new GeneralName(new X509Name("CN=Recip"));
+        //
+        //            
+        //
+        //        }
 
         [Test]
         public void TestNotBeforeNotAfter()
@@ -72,12 +73,11 @@ namespace Org.BouncyCastle.Cmp.Tests
             rsaKeyPairGenerator.Init(new RsaKeyGenerationParameters(BigInteger.ValueOf(65537), new SecureRandom(), 2048, 100));
             AsymmetricCipherKeyPair rsaKeyPair = rsaKeyPairGenerator.GenerateKeyPair();
 
-            doNotBeforeNotAfterTest(rsaKeyPair, new DateTime(1,1,1,0,0,1), new DateTime(1,1,1,0,0,10)); 
+            doNotBeforeNotAfterTest(rsaKeyPair, new DateTime(1, 1, 1, 0, 0, 1), new DateTime(1, 1, 1, 0, 0, 10));
             doNotBeforeNotAfterTest(rsaKeyPair, DateTime.MinValue, new DateTime(1, 1, 1, 0, 0, 10));
             doNotBeforeNotAfterTest(rsaKeyPair, new DateTime(1, 1, 1, 0, 0, 1), DateTime.MinValue);
         }
 
-
         private void doNotBeforeNotAfterTest(AsymmetricCipherKeyPair kp, DateTime notBefore, DateTime notAfter)
         {
             CertificateRequestMessageBuilder builder = new CertificateRequestMessageBuilder(BigInteger.One)
@@ -89,11 +89,11 @@ namespace Org.BouncyCastle.Cmp.Tests
 
             if (!notBefore.Equals(DateTime.MinValue))
             {
-                IsTrue("NotBefore did not match",(notBefore.Equals(msg.GetCertTemplate().Validity.NotBefore.ToDateTime())));
+                IsTrue("NotBefore did not match", (notBefore.Equals(msg.GetCertTemplate().Validity.NotBefore.ToDateTime())));
             }
             else
             {
-                IsTrue("Expected NotBefore to empty.",DateTime.MinValue == msg.GetCertTemplate().Validity.NotBefore.ToDateTime());
+                IsTrue("Expected NotBefore to empty.", DateTime.MinValue == msg.GetCertTemplate().Validity.NotBefore.ToDateTime());
             }
 
             if (!notAfter.Equals(DateTime.MinValue))
@@ -104,10 +104,8 @@ namespace Org.BouncyCastle.Cmp.Tests
             {
                 IsTrue("Expected NotAfter to be empty.", DateTime.MinValue == msg.GetCertTemplate().Validity.NotAfter.ToDateTime());
             }
-
         }
 
-
         [Test]
         public void TestSubsequentMessage()
         {
@@ -115,17 +113,13 @@ namespace Org.BouncyCastle.Cmp.Tests
             rsaKeyPairGenerator.Init(new RsaKeyGenerationParameters(BigInteger.ValueOf(65537), new SecureRandom(), 2048, 100));
             AsymmetricCipherKeyPair rsaKeyPair = rsaKeyPairGenerator.GenerateKeyPair();
 
-            TestCertBuilder builder = new TestCertBuilder()
-            {
-                NotBefore = DateTime.UtcNow.AddDays(-1),
-                NotAfter = DateTime.UtcNow.AddDays(1),
-                PublicKey = rsaKeyPair.Public,
-                SignatureAlgorithm = "Sha1WithRSAEncryption"
-
-            };
+            TestCertBuilder builder = new TestCertBuilder();
+            builder.NotBefore = DateTime.UtcNow.AddDays(-1);
+            builder.NotAfter = DateTime.UtcNow.AddDays(1);
+            builder.PublicKey = rsaKeyPair.Public;
+            builder.SignatureAlgorithm = "Sha1WithRSAEncryption";
 
             X509Certificate cert = builder.Build(rsaKeyPair.Private);
-
             GeneralName user = new GeneralName(new X509Name("CN=Test"));
 
             CertificateRequestMessageBuilder crmBuiler = new CertificateRequestMessageBuilder(BigInteger.One)
@@ -134,21 +128,18 @@ namespace Org.BouncyCastle.Cmp.Tests
 
             ISignatureFactory sigFact = new Asn1SignatureFactory("SHA256WithRSA", rsaKeyPair.Private);
 
-            ProtectedPkiMessage certRequestMsg = new ProtectedPkiMessageBuilder(user,user)
-                .SetTransactionId(new byte[]{1,2,3,4,5})
-                .SetBody(new PkiBody(PkiBody.TYPE_KEY_RECOVERY_REQ, new CertReqMessages(new CertReqMsg[]{crmBuiler.Build().ToAsn1Structure()})))
-                .AddCmpCertificate(cert)            
+            ProtectedPkiMessage certRequestMsg = new ProtectedPkiMessageBuilder(user, user)
+                .SetTransactionId(new byte[] { 1, 2, 3, 4, 5 })
+                .SetBody(new PkiBody(PkiBody.TYPE_KEY_RECOVERY_REQ, new CertReqMessages(new CertReqMsg[] { crmBuiler.Build().ToAsn1Structure() })))
+                .AddCmpCertificate(cert)
                 .Build(sigFact);
 
-            ProtectedPkiMessage msg = new ProtectedPkiMessage(new GeneralPKIMessage(certRequestMsg.ToAsn1Message().GetDerEncoded()));
+            ProtectedPkiMessage msg = new ProtectedPkiMessage(new GeneralPkiMessage(certRequestMsg.ToAsn1Message().GetDerEncoded()));
             CertReqMessages reqMsgs = CertReqMessages.GetInstance(msg.Body.Content);
             CertReqMsg reqMsg = reqMsgs.ToCertReqMsgArray()[0];
             IsEquals(ProofOfPossession.TYPE_KEY_ENCIPHERMENT, reqMsg.Popo.Type);
-
         }
 
-
-
         [Test]
         public void TestSampleCr()
         {
@@ -162,15 +153,11 @@ namespace Org.BouncyCastle.Cmp.Tests
                 "Ep9wvv+3+td5MEO+qMuWWxF8OZBlYIFBZ/k+pGlU+4XlBP5Ai6pu/EI/0A+1/bcGs0sQIDAQABMBQwEgYJKwY" +
                 "BBQUHBQEBDAVEVU1NWaACBQCgFwMVAO73HUPF//mY5+E714Cv5oprt0kO\r\n");
 
-            ProtectedPkiMessage msg = new ProtectedPkiMessage(new GeneralPKIMessage(raw));
+            ProtectedPkiMessage msg = new ProtectedPkiMessage(new GeneralPkiMessage(raw));
 
-            
-                       
             IsTrue(msg.Verify(new PKMacBuilder(), "TopSecret1234".ToCharArray()));
-
         }
 
-
         [Test]
         public void TestConfirmationMessage()
         {
@@ -178,14 +165,11 @@ namespace Org.BouncyCastle.Cmp.Tests
             rsaKeyPairGenerator.Init(new RsaKeyGenerationParameters(BigInteger.ValueOf(65537), new SecureRandom(), 2048, 100));
             AsymmetricCipherKeyPair rsaKeyPair = rsaKeyPairGenerator.GenerateKeyPair();
 
-            TestCertBuilder builder = new TestCertBuilder()
-            {
-                NotBefore = DateTime.UtcNow.AddDays(-1),
-                NotAfter = DateTime.UtcNow.AddDays(1),
-                PublicKey = rsaKeyPair.Public,
-                SignatureAlgorithm = "Sha1WithRSAEncryption"
-
-            };
+            TestCertBuilder builder = new TestCertBuilder();
+            builder.NotBefore = DateTime.UtcNow.AddDays(-1);
+            builder.NotAfter = DateTime.UtcNow.AddDays(1);
+            builder.PublicKey = rsaKeyPair.Public;
+            builder.SignatureAlgorithm = "Sha1WithRSAEncryption";
 
             builder.AddAttribute(X509Name.C, "Foo");
             X509Certificate cert = builder.Build(rsaKeyPair.Private);
@@ -198,7 +182,7 @@ namespace Org.BouncyCastle.Cmp.Tests
                 .Build();
 
             ProtectedPkiMessageBuilder msgBuilder = new ProtectedPkiMessageBuilder(sender, recipient);
-            msgBuilder.SetBody(new PkiBody(PkiBody.TYPE_CERT_CONFIRM, content.ToAsn1Structure()));            
+            msgBuilder.SetBody(new PkiBody(PkiBody.TYPE_CERT_CONFIRM, content.ToAsn1Structure()));
             msgBuilder.AddCmpCertificate(cert);
 
             ISignatureFactory sigFact = new Asn1SignatureFactory("MD5WithRSA", rsaKeyPair.Private);
@@ -208,51 +192,46 @@ namespace Org.BouncyCastle.Cmp.Tests
 
             IsTrue("PKIMessage must verify (MD5withRSA)", msg.Verify(verifierFactory));
 
-            IsEquals(sender,msg.Header.Sender);
-            IsEquals(recipient,msg.Header.Recipient);
+            IsEquals(sender, msg.Header.Sender);
+            IsEquals(recipient, msg.Header.Recipient);
 
             content = new CertificateConfirmationContent(CertConfirmContent.GetInstance(msg.Body.Content), new DefaultDigestAlgorithmIdentifierFinder());
             CertificateStatus[] statusList = content.GetStatusMessages();
-            IsEquals(1,statusList.Length);
+            IsEquals(1, statusList.Length);
             IsTrue(statusList[0].IsVerified(cert));
         }
 
-
-
         [Test]
-        public  void TestProtectedMessage()
+        public void TestProtectedMessage()
         {
-           RsaKeyPairGenerator rsaKeyPairGenerator = new RsaKeyPairGenerator();
-            rsaKeyPairGenerator.Init(new RsaKeyGenerationParameters(BigInteger.ValueOf(65537),new SecureRandom(),2048,100));
-           AsymmetricCipherKeyPair rsaKeyPair = rsaKeyPairGenerator.GenerateKeyPair();
+            RsaKeyPairGenerator rsaKeyPairGenerator = new RsaKeyPairGenerator();
+            rsaKeyPairGenerator.Init(new RsaKeyGenerationParameters(BigInteger.ValueOf(65537), new SecureRandom(), 2048, 100));
+            AsymmetricCipherKeyPair rsaKeyPair = rsaKeyPairGenerator.GenerateKeyPair();
 
-            TestCertBuilder builder = new TestCertBuilder()
-            {
-                NotBefore = DateTime.UtcNow.AddDays(-1),
-                NotAfter =  DateTime.UtcNow.AddDays(1),
-                PublicKey = rsaKeyPair.Public,
-                SignatureAlgorithm = "Sha1WithRSAEncryption"
-                      
-            };
+            TestCertBuilder builder = new TestCertBuilder();
+            builder.NotBefore = DateTime.UtcNow.AddDays(-1);
+            builder.NotAfter = DateTime.UtcNow.AddDays(1);
+            builder.PublicKey = rsaKeyPair.Public;
+            builder.SignatureAlgorithm = "Sha1WithRSAEncryption";
 
             builder.AddAttribute(X509Name.C, "Foo");
             X509Certificate cert = builder.Build(rsaKeyPair.Private);
 
             GeneralName sender = new GeneralName(new X509Name("CN=Sender"));
             GeneralName recipient = new GeneralName(new X509Name("CN=Recip"));
-          
-            ProtectedPkiMessageBuilder msgBuilder = new ProtectedPkiMessageBuilder(sender,recipient);
+
+            ProtectedPkiMessageBuilder msgBuilder = new ProtectedPkiMessageBuilder(sender, recipient);
             msgBuilder.AddCmpCertificate(cert);
-           
-            ISignatureFactory sigFact = new Asn1SignatureFactory("MD5WithRSA",rsaKeyPair.Private);
 
-            ProtectedPkiMessage msg =  msgBuilder.Build(sigFact);
+            ISignatureFactory sigFact = new Asn1SignatureFactory("MD5WithRSA", rsaKeyPair.Private);
+
+            ProtectedPkiMessage msg = msgBuilder.Build(sigFact);
 
             X509Certificate certificate = msg.GetCertificates()[0];
 
             IVerifierFactory verifierFactory = new Asn1VerifierFactory("MD5WithRSA", rsaKeyPair.Public);
 
-            IsTrue("PKIMessage must verify (MD5withRSA)",msg.Verify(verifierFactory));
+            IsTrue("PKIMessage must verify (MD5withRSA)", msg.Verify(verifierFactory));
         }
 
         [Test]
@@ -263,14 +242,11 @@ namespace Org.BouncyCastle.Cmp.Tests
                 100));
             AsymmetricCipherKeyPair rsaKeyPair = rsaKeyPairGenerator.GenerateKeyPair();
 
-            TestCertBuilder builder = new TestCertBuilder()
-            {
-                NotBefore = DateTime.UtcNow.AddDays(-1),
-                NotAfter = DateTime.UtcNow.AddDays(1),
-                PublicKey = rsaKeyPair.Public,
-                SignatureAlgorithm = "Sha1WithRSAEncryption"
-
-            };
+            TestCertBuilder builder = new TestCertBuilder();
+            builder.NotBefore = DateTime.UtcNow.AddDays(-1);
+            builder.NotAfter = DateTime.UtcNow.AddDays(1);
+            builder.PublicKey = rsaKeyPair.Public;
+            builder.SignatureAlgorithm = "Sha1WithRSAEncryption";
 
             builder.AddAttribute(X509Name.C, "Foo");
             X509Certificate cert = builder.Build(rsaKeyPair.Private);
@@ -291,79 +267,102 @@ namespace Org.BouncyCastle.Cmp.Tests
             IsTrue(msg.Verify(macFactory, "testpass".ToCharArray()));
         }
 
-     
-        
-
         [Test]
         public void TestVerifyBCJavaGeneratedMessage()
         {
-        //
-        // Test with content generated by BC-JAVA version.
-        //
+            //
+            // Test with content generated by BC-JAVA version.
+            //
 
-        ICipherParameters publicKey = PublicKeyFactory.CreateKey(Hex.Decode(
-            "305c300d06092a864886f70d0101010500034b003048024100ac1e59ba5f96" +
-            "ba86c86e6d8bbfd43ece04265fa29e6ebdb320388b58af365d05b26970cbd2" +
-            "6e5b0fa7df2074b90b42a1d16ab270cdb851b53e464b87f683774502030100" +
-            "01"));
-        ICipherParameters privateKey = PrivateKeyFactory.CreateKey(Hex.Decode(
-            "30820155020100300d06092a864886f70d01010105000482013f3082013b02" +
-            "0100024100ac1e59ba5f96ba86c86e6d8bbfd43ece04265fa29e6ebdb32038" +
-            "8b58af365d05b26970cbd26e5b0fa7df2074b90b42a1d16ab270cdb851b53e" +
-            "464b87f68377450203010001024046f3f208570c735349bfe00fdaa1fbcc00" +
-            "c0f2eebe42279876a168ac43fa74a8cdf9a1bb49066c07cfcfa7196f69f2b9" +
-            "419d378109db967891428c50273dcc37022100d488dc3fb86f404d726a8166" +
-            "b2a9aba9bee12fdbf38470a62403a2a20bad0977022100cf51874e479b141f" +
-            "9915533bf54d68f1940f84d7fe6130538ff01a23e3493423022100986f94f1" +
-            "0afa9837341219bfabf32fd16ebb9a94fa630a5ccf45e036b383275f02201b" +
-            "6dff07f563684b31f6e757548254733a12bf91d05f4d8490d3c4b1a0ddcb9f" +
-            "02210087c3b2049e9a3edfc4cb40a3a275dabf7ffff80b467157e384603042" +
-            "3fe91d68"));
-
-        byte[] ind = Hex.Decode(
-            "308201ac306e020102a4133011310f300d06035504030c0653656e646572a4" +
-            "123010310e300c06035504030c055265636970a140303e06092a864886f67d" +
-            "07420d30310414fdccb4ffd7848e6a697bee36cbe0f3722ed7fe2f30070605" +
-            "2b0e03021a020203e8300c06082b060105050801020500a10430023000a017" +
-            "031500c131c357441daa78eb538bfd9c24870e220fdafaa182011930820115" +
-            "308201113081bca003020102020601684a515d5b300d06092a864886f70d01" +
-            "01050500300f310d300b06035504030c0454657374301e170d313930313134" +
-            "3033303433325a170d3139303432343033303433325a300f310d300b060355" +
-            "04030c0454657374305c300d06092a864886f70d0101010500034b00304802" +
-            "4100ac1e59ba5f96ba86c86e6d8bbfd43ece04265fa29e6ebdb320388b58af" +
-            "365d05b26970cbd26e5b0fa7df2074b90b42a1d16ab270cdb851b53e464b87" +
-            "f68377450203010001300d06092a864886f70d0101050500034100264b5b76" +
-            "f268e2a992f05ad83783b091ce806a6726912c6200d06b33375ae58fe3c474" +
-            "c3a42ad6e572a2c48ae3bf914a7510bb995c3474829cfe71ab679a3db0");
-
-
-        ProtectedPkiMessage pkiMsg = new ProtectedPkiMessage(PkiMessage.GetInstance(ind));
-
-        PbmParameter pbmParameters = PbmParameter.GetInstance(pkiMsg.Header.ProtectionAlg.Parameters);
-
-        IsTrue(pkiMsg.Verify(new PKMacBuilder().SetParameters(pbmParameters), "secret".ToCharArray()));
+            ICipherParameters publicKey = PublicKeyFactory.CreateKey(Hex.Decode(
+                "305c300d06092a864886f70d0101010500034b003048024100ac1e59ba5f96" +
+                "ba86c86e6d8bbfd43ece04265fa29e6ebdb320388b58af365d05b26970cbd2" +
+                "6e5b0fa7df2074b90b42a1d16ab270cdb851b53e464b87f683774502030100" +
+                "01"));
+            ICipherParameters privateKey = PrivateKeyFactory.CreateKey(Hex.Decode(
+                "30820155020100300d06092a864886f70d01010105000482013f3082013b02" +
+                "0100024100ac1e59ba5f96ba86c86e6d8bbfd43ece04265fa29e6ebdb32038" +
+                "8b58af365d05b26970cbd26e5b0fa7df2074b90b42a1d16ab270cdb851b53e" +
+                "464b87f68377450203010001024046f3f208570c735349bfe00fdaa1fbcc00" +
+                "c0f2eebe42279876a168ac43fa74a8cdf9a1bb49066c07cfcfa7196f69f2b9" +
+                "419d378109db967891428c50273dcc37022100d488dc3fb86f404d726a8166" +
+                "b2a9aba9bee12fdbf38470a62403a2a20bad0977022100cf51874e479b141f" +
+                "9915533bf54d68f1940f84d7fe6130538ff01a23e3493423022100986f94f1" +
+                "0afa9837341219bfabf32fd16ebb9a94fa630a5ccf45e036b383275f02201b" +
+                "6dff07f563684b31f6e757548254733a12bf91d05f4d8490d3c4b1a0ddcb9f" +
+                "02210087c3b2049e9a3edfc4cb40a3a275dabf7ffff80b467157e384603042" +
+                "3fe91d68"));
+
+            byte[] ind = Hex.Decode(
+                "308201ac306e020102a4133011310f300d06035504030c0653656e646572a4" +
+                "123010310e300c06035504030c055265636970a140303e06092a864886f67d" +
+                "07420d30310414fdccb4ffd7848e6a697bee36cbe0f3722ed7fe2f30070605" +
+                "2b0e03021a020203e8300c06082b060105050801020500a10430023000a017" +
+                "031500c131c357441daa78eb538bfd9c24870e220fdafaa182011930820115" +
+                "308201113081bca003020102020601684a515d5b300d06092a864886f70d01" +
+                "01050500300f310d300b06035504030c0454657374301e170d313930313134" +
+                "3033303433325a170d3139303432343033303433325a300f310d300b060355" +
+                "04030c0454657374305c300d06092a864886f70d0101010500034b00304802" +
+                "4100ac1e59ba5f96ba86c86e6d8bbfd43ece04265fa29e6ebdb320388b58af" +
+                "365d05b26970cbd26e5b0fa7df2074b90b42a1d16ab270cdb851b53e464b87" +
+                "f68377450203010001300d06092a864886f70d0101050500034100264b5b76" +
+                "f268e2a992f05ad83783b091ce806a6726912c6200d06b33375ae58fe3c474" +
+                "c3a42ad6e572a2c48ae3bf914a7510bb995c3474829cfe71ab679a3db0");
+
+            ProtectedPkiMessage pkiMsg = new ProtectedPkiMessage(PkiMessage.GetInstance(ind));
+
+            PbmParameter pbmParameters = PbmParameter.GetInstance(pkiMsg.Header.ProtectionAlg.Parameters);
+
+            IsTrue(pkiMsg.Verify(new PKMacBuilder().SetParameters(pbmParameters), "secret".ToCharArray()));
+        }
     }
 
-
-    
-}
-
     public class TestCertBuilder
     {
         IDictionary attrs = new Hashtable();
         IList ord = new ArrayList();
         IList values = new ArrayList();
 
-        public DateTime NotBefore { get; set; }
+        private DateTime notBefore, notAfter;
+        private AsymmetricKeyParameter publicKey;
+        private string signatureAlgorithm;
+        private X509Name issuer, subject;
 
-        public DateTime NotAfter { get; set; }
+        public DateTime NotBefore
+        {
+            get { return notBefore; }
+            set { this.notBefore = value; }
+        }
 
-        public AsymmetricKeyParameter PublicKey { get; set; }
+        public DateTime NotAfter
+        {
+            get { return notAfter; }
+            set { this.notAfter = value; }
+        }
 
-        public String SignatureAlgorithm { get; set; }
+        public AsymmetricKeyParameter PublicKey
+        {
+            get { return publicKey; }
+            set { this.publicKey = value; }
+        }
 
-        public X509Name Issuer { get; set; }
-        public X509Name Subject { get; set; }
+        public string SignatureAlgorithm
+        {
+            get { return signatureAlgorithm; }
+            set { this.signatureAlgorithm = value; }
+        }
+
+        public X509Name Issuer
+        {
+            get { return issuer; }
+            set { this.issuer = value; }
+        }
+
+        public X509Name Subject
+        {
+            get { return subject; }
+            set { this.subject = value; }
+        }
 
         public TestCertBuilder AddAttribute(DerObjectIdentifier name, Object value)
         {
@@ -388,7 +387,6 @@ namespace Org.BouncyCastle.Cmp.Tests
                 certGen.SetIssuerDN(new X509Name(ord, attrs));
             }
 
-           
             certGen.SetNotBefore(NotBefore);
             certGen.SetNotAfter(NotAfter);
 
@@ -401,7 +399,6 @@ namespace Org.BouncyCastle.Cmp.Tests
                 certGen.SetSubjectDN(new X509Name(ord, attrs));
             }
 
-          
             certGen.SetPublicKey(PublicKey);
             certGen.SetSignatureAlgorithm(SignatureAlgorithm);