0.0.6 for Maven Central

Author: martinpaljak

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.github.martinpaljak</groupId>
     <artifactId>cdoc4j</artifactId>
     <packaging>jar</packaging>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <name>cdoc4j</name>
     <description>Java library for handling CDOC 1.0/1.1/2.0 files with AES-256 GCM and RSA or ECC recipients
     </description>

src/main/java/asic4j/ContainerFile.java

@@ -168,13 +168,6 @@ public boolean check(List<String> errors) throws IOException {
         return true;
     }
 
-    /**
-     * Get a file from the container with the given path.
-     *
-     * @param name path of the file in zip container
-     * @return bytes of the file
-     * @throws IOException
-     */
     public byte[] get(String name) throws IOException {
         ZipEntry ze = zf.getEntry(name);
         if (ze == null)

src/main/java/org/cdoc4j/XML.java

@@ -148,7 +148,7 @@ public static List<Node> asList(NodeList n) {
     }
 
     public static boolean validate_cdoc(byte[] d) throws IOException {
-        try (InputStream schema = XML.class.getResourceAsStream("xenc-schema.xsd")) {
+        try (InputStream schema = XML.class.getResourceAsStream("xenc-schema-11.xsd")) {
             return validate(d, schema);
         }
     }

src/test/java/TestEncryptDummy.java renamed to src/test/java/org/cdoc4j/TestEncryptDummy.java

@@ -1,5 +1,6 @@
+package org.cdoc4j;
+
 import org.apache.commons.io.IOUtils;
-import org.cdoc4j.*;
 import org.esteid.hacker.FakeEstEIDCA;
 import org.junit.*;
 import org.junit.rules.TestName;
@@ -37,13 +38,13 @@ public class TestEncryptDummy {
     public static void resources() throws Exception {
         // Extract resource
         dummy = Files.createTempFile(null, null);
-        IOUtils.copy(TestEncryptDummy.class.getResourceAsStream("CDOC-A-101-7.pdf"), Files.newOutputStream(dummy));
+        IOUtils.copy(TestEncryptDummy.class.getResourceAsStream("/CDOC-A-101-7.pdf"), Files.newOutputStream(dummy));
         System.out.println("Input file sizes: " + (Files.size(dummy)));
 
         // Parse certificates
         CertificateFactory cf = CertificateFactory.getInstance("X509");
-        ecc = (X509Certificate) cf.generateCertificate(TestEncryptDummy.class.getResourceAsStream("sk-auth-ecc.pem"));
-        rsa = (X509Certificate) cf.generateCertificate(TestEncryptDummy.class.getResourceAsStream("sk-auth.pem"));
+        ecc = (X509Certificate) cf.generateCertificate(TestEncryptDummy.class.getResourceAsStream("/sk-auth-ecc.pem"));
+        rsa = (X509Certificate) cf.generateCertificate(TestEncryptDummy.class.getResourceAsStream("/sk-auth.pem"));
     }
 
     @Before

src/test/java/org/cdoc4j/TestFullCycle.java

@@ -173,6 +173,7 @@ public void testV20RSA() throws Exception {
         CDOCBuilder creator = new CDOCBuilder(CDOC.VERSION.CDOC_V2_0);
         creator.addStream(HELLONAME, new ByteArrayInputStream(helloWorld));
         creator.addRecipient(rsacertificate);
+        creator.withValidation(true);
         creator.setOutputStream(mem);
         creator.build();
 
@@ -195,6 +196,7 @@ public void testV20Combined() throws Exception {
         creator.addRecipient(rsacertificate);
         creator.addRecipient(ecccertificate);
 
+        creator.withValidation(true);
         creator.setOutputStream(mem);
         creator.build();
 
@@ -219,6 +221,8 @@ public void testZipOutputStream() throws Exception {
         CDOCBuilder creator = new CDOCBuilder(VERSION.CDOC_V2_0);
         creator.addRecipient(ecccertificate);
         creator.setOutputStream(mem);
+        creator.withPrivacy(true);
+        creator.withValidation(true);
         try (ZipOutputStream zos = creator.buildZipOutputStream()) {
             zos.putNextEntry(new ZipEntry(HELLONAME));
             zos.write(helloWorld);