You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/12/14 04:52:27 UTC
directory-kerby git commit: Add two certificate encode tests.
Repository: directory-kerby
Updated Branches:
refs/heads/pkinit-support 60d61bbe5 -> a206450f3
Add two certificate encode tests.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/a206450f
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/a206450f
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/a206450f
Branch: refs/heads/pkinit-support
Commit: a206450f379e9870115f2f376055c6cf0353616f
Parents: 60d61bb
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Dec 14 11:59:01 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Dec 14 11:59:01 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kerby/cms/TestCertificate.java | 15 +++++++++++++++
.../java/org/apache/kerby/cms/TestSignedData.java | 15 +++++++++++++++
2 files changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a206450f/kerby-pkix/src/test/java/org/apache/kerby/cms/TestCertificate.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/test/java/org/apache/kerby/cms/TestCertificate.java b/kerby-pkix/src/test/java/org/apache/kerby/cms/TestCertificate.java
index 4a70971..fab8700 100644
--- a/kerby-pkix/src/test/java/org/apache/kerby/cms/TestCertificate.java
+++ b/kerby-pkix/src/test/java/org/apache/kerby/cms/TestCertificate.java
@@ -44,6 +44,21 @@ public class TestCertificate extends CmsTestBase {
}
@Test
+ public void testEncodingCertificate() throws IOException {
+ byte[] data = readDataFile("/certificate1.txt");
+ try {
+ Certificate certificate = new Certificate();
+ certificate.decode(data);
+ //TO BE FIXED
+ //certificate.encode();
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail();
+ }
+ }
+
+ @Test
public void testDecodingName() throws IOException {
byte[] data = readDataFile("/name.txt");
try {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a206450f/kerby-pkix/src/test/java/org/apache/kerby/cms/TestSignedData.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/test/java/org/apache/kerby/cms/TestSignedData.java b/kerby-pkix/src/test/java/org/apache/kerby/cms/TestSignedData.java
index a169421..4ea2afa 100644
--- a/kerby-pkix/src/test/java/org/apache/kerby/cms/TestSignedData.java
+++ b/kerby-pkix/src/test/java/org/apache/kerby/cms/TestSignedData.java
@@ -21,9 +21,12 @@ package org.apache.kerby.cms;
import org.apache.kerby.asn1.Asn1;
import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.cms.type.CertificateChoices;
+import org.apache.kerby.cms.type.CertificateSet;
import org.apache.kerby.cms.type.ContentInfo;
import org.apache.kerby.cms.type.EncapsulatedContentInfo;
import org.apache.kerby.cms.type.SignedData;
+import org.apache.kerby.x509.type.Certificate;
import org.junit.Assert;
import org.junit.Test;
@@ -63,6 +66,18 @@ public class TestSignedData extends CmsTestBase {
eContentInfo.setContentType(new Asn1ObjectIdentifier("1.3.6.1.5.2.3.1"));
eContentInfo.setContent("data".getBytes());
signedData.setEncapContentInfo(eContentInfo);
+
+ CertificateSet certificateSet = new CertificateSet();
+
+ byte[] data = readDataFile("/certificate1.txt");
+ Certificate certificate = new Certificate();
+ certificate.decode(data);
+ CertificateChoices certificateChoices = new CertificateChoices();
+ certificateChoices.setCertificate(certificate);
+ certificateSet.addElement(certificateChoices);
+ // To be fixed
+ //signedData.setCertificates(certificateSet);
+
contentInfo.setContent(signedData);
Asn1.dump(contentInfo);
byte[] encodedData = contentInfo.encode();