From bd854e7f7acb32f121731fb6386ac17d52424cfc Mon Sep 17 00:00:00 2001 From: Martin Beyer Date: Wed, 19 Aug 2020 15:31:42 +0200 Subject: [PATCH 1/2] updates secret-service for linux keychains and fixes #1268 --- .../keychain/LinuxSecretServiceKeychainAccessImpl.java | 3 +++ main/pom.xml | 2 +- main/ui/src/main/resources/license/THIRD-PARTY.txt | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java index 675992e5c..48b76fccb 100644 --- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java +++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java @@ -28,6 +28,9 @@ class LinuxSecretServiceKeychainAccessImpl implements KeychainAccessStrategy { if (list == null) { keyring.createItem(LABEL_FOR_SECRET_IN_KEYRING, passphrase, createAttributes(key)); } + else { + changePassphrase(key, passphrase); + } } catch (IOException e) { throw new KeychainAccessException(e); } diff --git a/main/pom.xml b/main/pom.xml index 2637067c1..0e9dd8a26 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -33,7 +33,7 @@ 14 3.11 - 1.0.0 + 1.1.0 3.10.3 1.0.3 29.0-jre diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt index 1914c284e..58a034c81 100644 --- a/main/ui/src/main/resources/license/THIRD-PARTY.txt +++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt @@ -17,9 +17,9 @@ Cryptomator uses 52 third-party dependencies under the following licenses: - jffi (com.github.jnr:jffi:1.2.23 - http://github.com/jnr/jffi) - jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm) - jnr-constants (com.github.jnr:jnr-constants:0.9.15 - http://github.com/jnr/jnr-constants) - - jnr-enxio (com.github.jnr:jnr-enxio:0.21 - http://github.com/jnr/jnr-enxio) + - jnr-enxio (com.github.jnr:jnr-enxio:0.28 - http://github.com/jnr/jnr-enxio) - jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi) - - jnr-unixsocket (com.github.jnr:jnr-unixsocket:0.23 - http://github.com/jnr/jnr-unixsocket) + - jnr-unixsocket (com.github.jnr:jnr-unixsocket:0.33 - http://github.com/jnr/jnr-unixsocket) - FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/) - Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson) - Dagger (com.google.dagger:dagger:2.22 - https://github.com/google/dagger) @@ -70,7 +70,7 @@ Cryptomator uses 52 third-party dependencies under the following licenses: - javafx-fxml (org.openjfx:javafx-fxml:14 - https://openjdk.java.net/projects/openjfx/javafx-fxml/) - javafx-graphics (org.openjfx:javafx-graphics:14 - https://openjdk.java.net/projects/openjfx/javafx-graphics/) LGPL 2.1: - - dbus-java (com.github.hypfvieh:dbus-java:3.2.1 - https://github.com/hypfvieh/dbus-java/dbus-java) + - dbus-java (com.github.hypfvieh:dbus-java:3.2.3 - https://github.com/hypfvieh/dbus-java/dbus-java) - jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) - Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna) - Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna) @@ -80,7 +80,7 @@ Cryptomator uses 52 third-party dependencies under the following licenses: - jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm) - jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined) - zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j) - - secret-service (de.swiesend:secret-service:1.0.0 - https://github.com/swiesend/secret-service) + - secret-service (de.swiesend:secret-service:1.1.0 - https://github.com/swiesend/secret-service) - Checker Qual (org.checkerframework:checker-qual:2.11.1 - https://checkerframework.org) - SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org) The BSD 2-Clause License: From 58ce1e45b85189301576daccfa160c12a6389aaf Mon Sep 17 00:00:00 2001 From: JaniruTEC Date: Wed, 19 Aug 2020 15:27:07 +0200 Subject: [PATCH 2/2] Updated Codestyle to not use any arrangements --- .idea/codeStyles/Project.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index d6cb2c866..0c9e1cbd8 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -36,6 +36,9 @@ + + +