From 6941603cddf2025e957c1c8173db7cdb59ac71fd Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 17 Mar 2021 13:03:55 +0100
Subject: [PATCH] update to latest cryptolib/cryptofs beta

---
 main/pom.xml                                                    | 2 +-
 .../ui/addvaultwizard/CreateNewVaultPasswordController.java     | 2 +-
 .../java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 362f181b1..d39d4f722 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,7 +25,7 @@
 		<project.jdk.version>16</project.jdk.version>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.0.0-beta4</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.0.0-beta5</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.0.0-beta2</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.0.0-beta2</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.0.0-beta2</cryptomator.integrations.mac.version>
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 e4f02ac8e..b37ffc80c 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
@@ -172,7 +172,7 @@ public class CreateNewVaultPasswordController implements FxController {
 	private void initializeVault(Path path, CharSequence passphrase) throws IOException {
 		// 1. write masterkey:
 		Path masterkeyFilePath = path.resolve(MASTERKEY_FILENAME);
-		try (Masterkey masterkey = Masterkey.createNew(csprng)) {
+		try (Masterkey masterkey = Masterkey.generate(csprng)) {
 			masterkeyFileAccess.persist(masterkey, masterkeyFilePath, passphrase);
 		}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java
index 28aaa1d71..ee159e072 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java
@@ -88,7 +88,7 @@ public class RecoveryKeyFactory {
 	 */
 	public void resetPasswordWithRecoveryKey(Path vaultPath, String recoveryKey, CharSequence newPassword) throws IOException, IllegalArgumentException {
 		final byte[] rawKey = decodeRecoveryKey(recoveryKey);
-		try (var masterkey = Masterkey.createFromRaw(rawKey)) {
+		try (var masterkey = new Masterkey(rawKey)) {
 			Path masterkeyPath = vaultPath.resolve(MASTERKEY_FILENAME);
 			if (Files.exists(masterkeyPath)) {
 				byte[] oldMasterkeyBytes = Files.readAllBytes(masterkeyPath);