Merge branch 'develop'

# Conflicts: # pom.xml
dracoon · Jul 1, 2021 · f5b180f · f5b180f
2 parents 854bc1a + 2a2e50d
commit f5b180f
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -23,13 +23,13 @@ Maven: Add this dependency to your pom.xml:
 <dependency>
     <groupId>com.dracoon</groupId>
     <artifactId>dracoon-crypto-sdk</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
 </dependency>
 ```
 
 Gradle: Add this dependency to your build.gradle:
 ```groovy
-compile 'com.dracoon:dracoon-crypto-sdk:2.0.0'
+compile 'com.dracoon:dracoon-crypto-sdk:2.0.1'
 ```
 
 JAR import: The latest JAR can be found [here](

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.dracoon</groupId>
     <artifactId>dracoon-crypto-sdk</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
 
     <name>dracoon-crypto-sdk</name>
     <description>A library which implements the client-side encryption of Dracoon.</description>
@@ -52,20 +52,20 @@
         <java-version>1.8</java-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <bouncycastle.version>1.65</bouncycastle.version>
-        <junit.version>4.12</junit.version>
+        <bouncycastle.version>1.69</bouncycastle.version>
+        <junit.version>4.13.2</junit.version>
         <gson.version>2.8.0</gson.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk15to18</artifactId>
             <version>${bouncycastle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk15to18</artifactId>
             <version>${bouncycastle.version}</version>
         </dependency>
 
@@ -128,6 +128,25 @@
                     <excludedGroups>com.dracoon.sdk.crypto.integration.IntegrationTest</excludedGroups>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${maven-failsafe-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>verify</goal>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <includes>
+                        <include>**/*.java</include>
+                    </includes>
+                    <groups>com.dracoon.sdk.crypto.integration.IntegrationTest</groups>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -139,32 +158,6 @@
     </distributionManagement>
 
     <profiles>
-        <profile>
-            <id>integration-tests</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${maven-failsafe-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <includes>
-                                <include>**/*.java</include>
-                            </includes>
-                            <groups>com.dracoon.sdk.crypto.integration.IntegrationTest</groups>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>release</id>
             <build>

diff --git a/src/test/resources/integration/js/data/fk_rsa2048_aes256gcm/enc_file_key.json b/src/test/resources/integration/js/data/fk_rsa2048_aes256gcm/enc_file_key.json
@@ -1,6 +1,6 @@
 {
     "version": "A",
-    "key": "FshgfWrswSlKMFNHZO4riUavq5ZYHSMuVaonrM05x4Hl5iEE75T/okXgl85bsOBs9JhCoUg/E48b2HERAhUPa/NKwqaSYZDtB1ECFLzlQw57ESuXuu5uC4vrhO8St8uxAs6n8wFOBjTVl3QgGMwEYIoqHhOwU8WUDcgeC5zcFSF1ZklA5L//OkDeXDqwUTRqAc8g4sLTPVmIUdWaEhDYOTViQ2A4EE9n1PZBnyWO/dlP+fdbW7VNLlnV6v9591TqtV7nJiHp9SwV10eKqsijoPYRtQlyA1+Ty4xCjmVLuI4+E542JDsMacuTq4WcDq6epNdTawJZ+Z21haVc5Td5Ig==",
-    "iv": "VyrEra8twbh0dbI0",
-    "tag": "f+j5fRhTldudYlKMq46Frw=="
+    "key": "AxSPLPAKbSlqogont1oYaxHy4GbXApxd+DEhX7PHNO8ADH4FjPT8NZtuPDUzRZiwhf94wXdn02yfxFD8GnxXc9KHxyCFfyrjNl4Uvx4gsiyS569DCsvPjF11YkwL5jx8m9Z96qAOphPxIlZPZXgfneU3JxkNBkzk4pVgsVKelDVkdQsd0XZdBgfjHDQtlUT2e8MWCRFUW/IJZk3TY/qBX6NotoRhB5VHOMQSTf0fDdSyP4kZAb2yuzhljl0HJP+wv1YKvideg0+XvGMy68NIr+fXAXzKOUq3anLAB96y5/0j3VeJwGArMVzwnZJPHtIt4xg/fkcxUltnYZGsb84Ngw==",
+    "iv": "XvBq1jDNoto0JjnB",
+    "tag": "3sJKrocoRZaZeHEUJmTQTQ=="
 }
diff --git a/src/test/resources/integration/js/data/fk_rsa2048_aes256gcm/plain_file_key.json b/src/test/resources/integration/js/data/fk_rsa2048_aes256gcm/plain_file_key.json
@@ -1,6 +1,6 @@
 {
     "version": "A",
-    "key": "HNAtK7sra2eOuVwR1lWI6y93rbF3DPCQUt5XNWGkMqQ=",
-    "iv": "VyrEra8twbh0dbI0",
-    "tag": "f+j5fRhTldudYlKMq46Frw=="
+    "key": "p0gqcXCa4R6Qa0G3t4xUlP2R3MtNdErHAzn60JlAGvc=",
+    "iv": "XvBq1jDNoto0JjnB",
+    "tag": "3sJKrocoRZaZeHEUJmTQTQ=="
 }
diff --git a/src/test/resources/integration/js/data/fk_rsa4096_aes256gcm/enc_file_key.json b/src/test/resources/integration/js/data/fk_rsa4096_aes256gcm/enc_file_key.json
@@ -1,6 +1,6 @@
 {
     "version": "RSA-4096/AES-256-GCM",
-    "key": "Iyi6NS/0V2AIzMsA8YVpeWD+Mh23JBqGYflvILgx/2jmi8pIR+oQbvkftjHoS2rANc2s6a9SQ02uoXBrKNLB5B+wHB1c4WWEbfVebcXmoNyX32UZRmd5l9p+Z5Tcx2bHU5r/Rpi2MooOu87UE7uyXE2c5sq9T4iyIYLbhye56R5GfU6YC3J1swHlZoSjfontQyCazimHqR7PEopx2VR0QF3Zf46gmDaZK/u478yhxTKFLwSpS+JQn/ajsRATk96ae2Wu9oPydlLfCloINlE+4wp11B/9fNQ1rm5Qr8k7hPw24ox+D7a61XO25gJq1v1ziUwY2JXOXxZD6D9DaO0VZ5fGU3F0yJj1e/WaGgamZltVijepjwTDDv+x9DYvppAfMqGMrDlgmfznNfQb+rSKG/N/byeeBLVCfIfl13FYAZU5IpEv/+yEWRpAuhDv6opeaX1Ip6VJpC6+h+129e4XY6P2UqDA9N69mAkQN0j7R0SsUuIzybwgGVMc3reAbQtLpUkuFcYrqKwlg+Y4KhhIKPEL28jrbwBurNy52/B2R5O9T8/s2f910wThZzF5El+dIBIqKgyKRswQnop7qLg3SBvr7Y+ZXZTdR+w2rG6gno5yhXs/kRwMwMq023xK2JzNtvH9RoFFrRIbTe3WTaReP4yK24d1OGNXkwWUkvplHxg=",
-    "iv": "VyrEra8twbh0dbI0",
-    "tag": "f+j5fRhTldudYlKMq46Frw=="
+    "key": "iRg0tcm4k/cTl1kwKyUPE4eYMaBzjVT8U4Uw29RoVNaxUsJv/aisjRZbh5TWcdru3JG7Ko33r3QSBz1hvpmAy40wTXeX7EtnHCvBsUptVnGo0Pu1EoeLDq/InAXRXGeeVvG8CsAY4aWrdZrI1+qriLd5sGhB9iJjE9j1NZpChB4kmxw5ci98SPk6ufkJpWLJLnayFd6Uu4Tu/kGZrYkOVcgN7HX6coVjbx3y1JUakUJDL/bV1Qi8xCqqCz3oFpOlIGVjLmZo1vwszJpVvvfowG7ryo5Jrrzft2zVrRVityOc4tClK3beTOq9tpD3B5Bcy/bZudK1R1aMD8VXqcnisCmiKXU0mu2PpfqtBqVwibyAw9PfzoXcotxhrDEAl5b/JOBcQonqrCH0kZG4cevrbWeTHEjAERRVdfRTlpLqFsiaaKzfQv4qpVDZO0+jUHmCwULec1dGmzjvWcfXWCAanXkB9C9BmDbx4jHZWyT3Kom7CBigG40ahBeB/HdH+MBsa6L8aHAvtxRm5nn8TL3TF28yuRUtBYe9TzOw5hM5XB3T+2Ymk/Hqh9Cl+RcKc1JsdueXCs+B8Wk3QPXu1dL+2j6mC21z60i3piXJ69uGcM9MRMv3sTX+uW+cZ+OCY1RuhZZx3lHqWKMMv37IKUxTYk83kJUMRx5QuhP3LCN+/vY=",
+    "iv": "XvBq1jDNoto0JjnB",
+    "tag": "3sJKrocoRZaZeHEUJmTQTQ=="
 }
diff --git a/src/test/resources/integration/js/data/fk_rsa4096_aes256gcm/plain_file_key.json b/src/test/resources/integration/js/data/fk_rsa4096_aes256gcm/plain_file_key.json
@@ -1,6 +1,6 @@
 {
     "version": "A",
-    "key": "HNAtK7sra2eOuVwR1lWI6y93rbF3DPCQUt5XNWGkMqQ=",
-    "iv": "VyrEra8twbh0dbI0",
-    "tag": "f+j5fRhTldudYlKMq46Frw=="
+    "key": "p0gqcXCa4R6Qa0G3t4xUlP2R3MtNdErHAzn60JlAGvc=",
+    "iv": "XvBq1jDNoto0JjnB",
+    "tag": "3sJKrocoRZaZeHEUJmTQTQ=="
 }
diff --git a/src/test/resources/integration/js/data/kp_rsa2048/private_key.json b/src/test/resources/integration/js/data/kp_rsa2048/private_key.json
@@ -1,4 +1,4 @@
 {
     "version": "A",
-    "privateKey": "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n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\r\n-----END ENCRYPTED PRIVATE KEY-----\r\n"
+    "privateKey": "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n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\r\n-----END ENCRYPTED PRIVATE KEY-----\r\n"
 }
diff --git a/src/test/resources/integration/js/data/kp_rsa2048/public_key.json b/src/test/resources/integration/js/data/kp_rsa2048/public_key.json
@@ -1,4 +1,4 @@
 {
     "version": "A",
-    "publicKey": "-----BEGIN PUBLIC KEY-----\r\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAipzvZByv2btBwgP26KOZ\r\n+bhLLQ+z3ZvcncoOovxdiP7td/p3wmSDcVPYBy7GcpvaLy1CRmE+UkBqEsLl/sob\r\n39Y2Pf2cOzKXB1RcnZTpt21QVTPh07WexIJ4vfqqp8wjt9dPYIe/ExvmnQF3Y4lB\r\nmlC/1PpugGFmPKWItNw2Q1SrIGZud7S8DGiZYoA01g9jTfmDIwSlWFXBuOyYdcS+\r\notvQgq71mIzuvPsaar4c2ZhDymrDUIvyiqetLxustlQjUcuMe/vvUfZUtyx9i/dm\r\n76JLpnJxNBMVJ/NX/Kd9vKA7zNg8MM54yJNsyHEdUdqqLbtrso2pyW3Igs4LToAO\r\n+QIDAQAB\r\n-----END PUBLIC KEY-----\r\n"
+    "publicKey": "-----BEGIN PUBLIC KEY-----\r\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4+X9ojSr4Y5bQ3vYHETs\r\nJkkoKlRibjq6I8cMIFsJwx8ZEVx1dZsqeCtl6mCq9rfMzbQQ7Q324GKopTjlH938\r\nUgT/gt96RyTFQX3qxRqVBcbf/gp0j7hqQnvuWJ1A1tI5rgn/S4U7ph1VTXc6WMQu\r\nS7Ftqsv9SHDurA9y+JfXfAbTXAQEGTVfOkwzNCKs8L/pJ2CgUOLDXzvIVQ7gmqLi\r\nq9Tt6hU1BOwjgnnVoCEstjuM5j8hsnncZJe5bDGcF22Iz6JRAEajjc972o22cFe7\r\nDGaEw27CwA7P5np6vomU1H23uV8Oha5i1BVwkisdrPgj8QlSeDfpoUQRcI9Xx8Dz\r\n6wIDAQAB\r\n-----END PUBLIC KEY-----\r\n"
 }
diff --git a/src/test/resources/integration/js/data/kp_rsa4096/private_key.json b/src/test/resources/integration/js/data/kp_rsa4096/private_key.json
@@ -1,4 +1,4 @@
 {
     "version": "RSA-4096",
-    "privateKey": "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n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\r\n-----END ENCRYPTED PRIVATE KEY-----\r\n"
+    "privateKey": "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n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\r\n-----END ENCRYPTED PRIVATE KEY-----\r\n"
 }