From 573ad03d68e57e93e971a63cfc231094b3e9e79a Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 3 May 2021 17:33:28 +0200 Subject: [PATCH] bug fixin' --- .../ui/addvaultwizard/CreateNewVaultPasswordController.java | 2 +- .../org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java index b55c0df60..b61d36748 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java @@ -180,7 +180,7 @@ public class CreateNewVaultPasswordController implements FxController { // 2. initialize vault: try { - MasterkeyLoader loader = ignored -> masterkey; + MasterkeyLoader loader = ignored -> masterkey.clone(); CryptoFileSystemProperties fsProps = CryptoFileSystemProperties.cryptoFileSystemProperties().withCipherCombo(VaultCipherCombo.SIV_CTRMAC).withKeyLoader(loader).build(); CryptoFileSystemProvider.initialize(path, fsProps, DEFAULT_KEY_ID); diff --git a/main/ui/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java b/main/ui/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java index 945ec0078..672b7a3b8 100644 --- a/main/ui/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java +++ b/main/ui/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java @@ -16,9 +16,8 @@ import java.security.SecureRandom; class RecoveryKeyFactoryTest { private WordEncoder wordEncoder = new WordEncoder(); - private SecureRandom csprng = Mockito.mock(SecureRandom.class); private MasterkeyFileAccess masterkeyFileAccess = Mockito.mock(MasterkeyFileAccess.class); - private RecoveryKeyFactory inTest = new RecoveryKeyFactory(wordEncoder, csprng, masterkeyFileAccess); + private RecoveryKeyFactory inTest = new RecoveryKeyFactory(wordEncoder, masterkeyFileAccess); @Test @DisplayName("createRecoveryKey() creates 44 words")