From 526b2a1e72ee057593eb8a6f2fccba23f3fad517 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 22 Sep 2021 16:20:48 +0200 Subject: [PATCH] Bump cryptofs and adjust usages --- pom.xml | 2 +- .../ui/addvaultwizard/CreateNewVaultPasswordController.java | 2 +- src/main/java/org/cryptomator/ui/health/CheckExecutor.java | 2 +- src/main/java/org/cryptomator/ui/health/ResultFixApplier.java | 2 +- src/main/java/org/cryptomator/ui/health/StartController.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index efb61f369..65359695f 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.github.serceman,com.github.jnr,org.ow2.asm,net.java.dev.jna,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh - 2.1.0-beta9 + 2.1.0-beta13 1.0.0-rc1 1.0.0-beta2 1.0.0-beta2 diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java index 627793d6e..578b90969 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java @@ -182,7 +182,7 @@ public class CreateNewVaultPasswordController implements FxController { // 2. initialize vault: try { - MasterkeyLoader loader = ignored -> masterkey.clone(); + MasterkeyLoader loader = ignored -> masterkey.copy(); CryptoFileSystemProperties fsProps = CryptoFileSystemProperties.cryptoFileSystemProperties().withCipherCombo(CryptorProvider.Scheme.SIV_CTRMAC).withKeyLoader(loader).build(); CryptoFileSystemProvider.initialize(path, fsProps, DEFAULT_KEY_ID); diff --git a/src/main/java/org/cryptomator/ui/health/CheckExecutor.java b/src/main/java/org/cryptomator/ui/health/CheckExecutor.java index 5b14bd17c..a9ee9a17f 100644 --- a/src/main/java/org/cryptomator/ui/health/CheckExecutor.java +++ b/src/main/java/org/cryptomator/ui/health/CheckExecutor.java @@ -67,7 +67,7 @@ public class CheckExecutor { @Override protected Void call() throws Exception { - try (var masterkeyClone = masterkey.clone(); // + try (var masterkeyClone = masterkey.copy(); // var cryptor = CryptorProvider.forScheme(vaultConfig.getCipherCombo()).provide(masterkeyClone, csprng)) { c.getHealthCheck().check(vaultPath, vaultConfig, masterkeyClone, cryptor, diagnosis -> { Platform.runLater(() -> c.getResults().add(Result.create(diagnosis))); diff --git a/src/main/java/org/cryptomator/ui/health/ResultFixApplier.java b/src/main/java/org/cryptomator/ui/health/ResultFixApplier.java index 841a8f5c4..3dc91e33b 100644 --- a/src/main/java/org/cryptomator/ui/health/ResultFixApplier.java +++ b/src/main/java/org/cryptomator/ui/health/ResultFixApplier.java @@ -50,7 +50,7 @@ class ResultFixApplier { public void fix(DiagnosticResult diagnosis) { Preconditions.checkArgument(diagnosis.getSeverity() == DiagnosticResult.Severity.WARN, "Unfixable result"); - try (var masterkeyClone = masterkey.clone(); // + try (var masterkeyClone = masterkey.copy(); // var cryptor = CryptorProvider.forScheme(vaultConfig.getCipherCombo()).provide(masterkeyClone, csprng)) { diagnosis.fix(vaultPath, vaultConfig, masterkeyClone, cryptor); } catch (Exception e) { diff --git a/src/main/java/org/cryptomator/ui/health/StartController.java b/src/main/java/org/cryptomator/ui/health/StartController.java index 0f2b1e6d3..44c3f3a8f 100644 --- a/src/main/java/org/cryptomator/ui/health/StartController.java +++ b/src/main/java/org/cryptomator/ui/health/StartController.java @@ -81,7 +81,7 @@ public class StartController implements FxController { try (var masterkey = keyLoadingStrategy.loadKey(unverifiedCfg.getKeyId())) { var verifiedCfg = unverifiedCfg.verify(masterkey.getEncoded(), unverifiedCfg.allegedVaultVersion()); vaultConfigRef.set(verifiedCfg); - var old = masterkeyRef.getAndSet(masterkey.clone()); + var old = masterkeyRef.getAndSet(masterkey.copy()); if (old != null) { old.destroy(); }