Merge pull request #71 from slovensko-digital/fix/dss-upgrade

DSS libs upgraded to 5.11.1, updated path to driver for osx
slovensko-digital · Nov 14, 2022 · ccc8c84 · ccc8c84
2 parents 12d7d60 + d3e0384
commit ccc8c84
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>17</java.version>
-        <dss.version>5.9</dss.version>
+        <dss.version>5.11.1</dss.version>
         <gson.version>2.8.9</gson.version>
         <apache.httpcomponents.version>4.5.13</apache.httpcomponents.version>
         <pdfjs.version>2.10.377</pdfjs.version>
@@ -23,54 +23,50 @@
         <main.class>com.octosign.whitelabel.ui.Main</main.class>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>cefdigital</id>
-            <name>cefdigital</name>
-            <url>https://ec.europa.eu/cefdigital/artifact/content/repositories/esignaturedss/</url>
-        </repository>
-    </repositories>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>eu.europa.ec.joinup.sd-dss</groupId>
+                <artifactId>dss-bom</artifactId>
+                <version>${dss.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
             <groupId>eu.europa.ec.joinup.sd-dss</groupId>
             <artifactId>dss-service</artifactId>
-            <version>${dss.version}</version>
         </dependency>
         <dependency>
             <groupId>eu.europa.ec.joinup.sd-dss</groupId>
             <artifactId>dss-tsl-validation</artifactId>
-            <version>${dss.version}</version>
         </dependency>
         <dependency>
             <groupId>eu.europa.ec.joinup.sd-dss</groupId>
             <artifactId>dss-crl-parser-stream</artifactId>
-            <version>${dss.version}</version>
         </dependency>
         <dependency>
             <groupId>eu.europa.ec.joinup.sd-dss</groupId>
             <artifactId>dss-asic-xades</artifactId>
-            <version>${dss.version}</version>
         </dependency>
         <dependency>
             <groupId>eu.europa.ec.joinup.sd-dss</groupId>
             <artifactId>dss-asic-cades</artifactId>
-            <version>${dss.version}</version>
         </dependency>
         <dependency>
             <groupId>eu.europa.ec.joinup.sd-dss</groupId>
             <artifactId>dss-pades-pdfbox</artifactId>
-            <version>${dss.version}</version>
         </dependency>
         <dependency>
             <groupId>eu.europa.ec.joinup.sd-dss</groupId>
             <artifactId>dss-token</artifactId>
-            <version>${dss.version}</version>
         </dependency>
         <dependency>
             <groupId>eu.europa.ec.joinup.sd-dss</groupId>
             <artifactId>dss-utils-google-guava</artifactId>
-            <version>${dss.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/src/main/java/com/octosign/whitelabel/signing/token/Token.java b/src/main/java/com/octosign/whitelabel/signing/token/Token.java
@@ -83,6 +83,13 @@ private static void loadDrivers() {
                       .file(MAC, "/Applications/Aplikacia_pre_eID.app/Contents/pkcs11/libPkcs11.dylib")
                       .keystore(PKCS11),
 
+                Driver.name("eIDv4")
+                        .tokenType(translate("text.idCard"))
+                        .file(WINDOWS, "C:\\Program Files (x86)\\eID_klient\\pkcs11_x64.dll")
+                        .file(LINUX, "/usr/lib/eID_klient/libpkcs11_x64.so")
+                      .file(MAC, "/Applications/eID_klient.app/Contents/Frameworks/libPkcs11.dylib")
+                      .keystore(PKCS11),
+
                 Driver.name("ICASecureStore")
                       .tokenType(translate("text.mandateCertificate"))
 //                      .file(WINDOWS, "C:\\Program Files\\I.CA SecureStore\\ICASecureStorePkcs11.dll")