summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Hook <dgh@bouncycastle.org>2019-01-15 05:05:28 +1100
committerDavid Hook <dgh@bouncycastle.org>2019-01-15 05:05:28 +1100
commit765320e540fe7b5d98b84915c3281c1140ad47b5 (patch)
tree2ad430cf228d19fd143751ec389a7b83acb0915d
parentmoved ASN.1 class back (diff)
parentRemoved reference to old test. (diff)
downloadBouncyCastle.NET-ed25519-765320e540fe7b5d98b84915c3281c1140ad47b5.tar.xz
Merge remote-tracking branch 'origin/master'
-rw-r--r--crypto/test/src/cms/test/AllTests.cs3
-rw-r--r--crypto/test/src/ejbca/test/EnrollmentExampleTest.cs6
2 files changed, 5 insertions, 4 deletions
diff --git a/crypto/test/src/cms/test/AllTests.cs b/crypto/test/src/cms/test/AllTests.cs
index 7ab5721ac..52ca95f2b 100644
--- a/crypto/test/src/cms/test/AllTests.cs
+++ b/crypto/test/src/cms/test/AllTests.cs
@@ -20,8 +20,7 @@ namespace Org.BouncyCastle.Cms.Tests
         {
             get
             {
-                TestSuite suite = new TestSuite("CMS Tests");
-                suite.Add(new ProtectedMessageTest());
+                TestSuite suite = new TestSuite("CMS Tests");               
                 suite.Add(new CompressedDataTest());
                 suite.Add(new CompressedDataStreamTest());
                 suite.Add(new EnvelopedDataTest());
diff --git a/crypto/test/src/ejbca/test/EnrollmentExampleTest.cs b/crypto/test/src/ejbca/test/EnrollmentExampleTest.cs
index 3a636d8ea..4ee0ae2c3 100644
--- a/crypto/test/src/ejbca/test/EnrollmentExampleTest.cs
+++ b/crypto/test/src/ejbca/test/EnrollmentExampleTest.cs
@@ -1,4 +1,6 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
+using Org.BouncyCastle.Asn1;
 using Org.BouncyCastle.Asn1.Cmp;
 using Org.BouncyCastle.Asn1.Crmf;
 using Org.BouncyCastle.Asn1.X509;
@@ -54,7 +56,7 @@ namespace crypto.test.src.ejbca.test
             GeneralName recipient = new GeneralName(issuerDN);
 
             ProtectedPkiMessageBuilder pbuilder = new ProtectedPkiMessageBuilder(sender, recipient);
-            // pbuilder. SetMessageTime(new Date());
+            pbuilder.SetMessageTime(new DerGeneralizedTime(DateTime.Now));
             // senderNonce
             pbuilder.SetSenderNonce(senderNonce);
             // TransactionId