From 07d3d57ec7ebec009eeabc5aa177cf2d58b3955a Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Wed, 2 Nov 2022 21:57:14 +0100 Subject: [PATCH 1/4] dss updated to 5.11.1, updated dependencies management according to https://github.com/esig/dss/tree/5.11.1#readme --- pom.xml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 5596e1829..aec521f5f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ UTF-8 17 - 5.9 + 5.11.1 2.8.9 4.5.13 2.10.377 @@ -23,54 +23,50 @@ com.octosign.whitelabel.ui.Main - - - cefdigital - cefdigital - https://ec.europa.eu/cefdigital/artifact/content/repositories/esignaturedss/ - - + + + + eu.europa.ec.joinup.sd-dss + dss-bom + ${dss.version} + pom + import + + + eu.europa.ec.joinup.sd-dss dss-service - ${dss.version} eu.europa.ec.joinup.sd-dss dss-tsl-validation - ${dss.version} eu.europa.ec.joinup.sd-dss dss-crl-parser-stream - ${dss.version} eu.europa.ec.joinup.sd-dss dss-asic-xades - ${dss.version} eu.europa.ec.joinup.sd-dss dss-asic-cades - ${dss.version} eu.europa.ec.joinup.sd-dss dss-pades-pdfbox - ${dss.version} eu.europa.ec.joinup.sd-dss dss-token - ${dss.version} eu.europa.ec.joinup.sd-dss dss-utils-google-guava - ${dss.version} com.google.code.gson From 9e7d7cded67b4e1776090672b290caf4fcb6b271 Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Wed, 2 Nov 2022 21:57:55 +0100 Subject: [PATCH 2/4] added driver for eID 4.* (different path for pcks libs at least for osx) --- .../java/com/octosign/whitelabel/signing/token/Token.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/octosign/whitelabel/signing/token/Token.java b/src/main/java/com/octosign/whitelabel/signing/token/Token.java index 41121071c..05b1837fe 100644 --- 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)\\EAC MW klient\\pkcs11_x64.dll") + .file(LINUX, "/usr/lib/eac_mw_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") From b488b2463116eb16cc3a4f5b76333f9bc976e94e Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Thu, 10 Nov 2022 08:50:17 +0100 Subject: [PATCH 3/4] removed custom driver for eIDv4, updated path within existing one (for osx) --- .../com/octosign/whitelabel/signing/token/Token.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/com/octosign/whitelabel/signing/token/Token.java b/src/main/java/com/octosign/whitelabel/signing/token/Token.java index 05b1837fe..a95278835 100644 --- a/src/main/java/com/octosign/whitelabel/signing/token/Token.java +++ b/src/main/java/com/octosign/whitelabel/signing/token/Token.java @@ -80,16 +80,9 @@ private static void loadDrivers() { .tokenType(translate("text.idCard")) .file(WINDOWS, "C:\\Program Files (x86)\\EAC MW klient\\pkcs11_x64.dll") .file(LINUX, "/usr/lib/eac_mw_klient/libpkcs11_x64.so") - .file(MAC, "/Applications/Aplikacia_pre_eID.app/Contents/pkcs11/libPkcs11.dylib") + .file(MAC, "/Applications/eID_klient.app/Contents/Frameworks/libPkcs11.dylib") .keystore(PKCS11), - Driver.name("eIDv4") - .tokenType(translate("text.idCard")) - .file(WINDOWS, "C:\\Program Files (x86)\\EAC MW klient\\pkcs11_x64.dll") - .file(LINUX, "/usr/lib/eac_mw_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") From d3e0384c02eb820aff43d6b0cc01339e50b90f5b Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Mon, 14 Nov 2022 14:10:46 +0100 Subject: [PATCH 4/4] created driver for eIDv4 with new paths for all OS --- .../java/com/octosign/whitelabel/signing/token/Token.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/octosign/whitelabel/signing/token/Token.java b/src/main/java/com/octosign/whitelabel/signing/token/Token.java index a95278835..cc17d20fd 100644 --- a/src/main/java/com/octosign/whitelabel/signing/token/Token.java +++ b/src/main/java/com/octosign/whitelabel/signing/token/Token.java @@ -80,6 +80,13 @@ private static void loadDrivers() { .tokenType(translate("text.idCard")) .file(WINDOWS, "C:\\Program Files (x86)\\EAC MW klient\\pkcs11_x64.dll") .file(LINUX, "/usr/lib/eac_mw_klient/libpkcs11_x64.so") + .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),