Migrate API changes.

Author: ylangisc

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoVault.java

@@ -45,6 +45,7 @@
 import org.cryptomator.cryptolib.api.FileHeaderCryptor;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.cryptolib.api.Masterkey;
+import org.cryptomator.cryptolib.api.PerpetualMasterkey;
 import org.cryptomator.cryptolib.common.MasterkeyFile;
 import org.cryptomator.cryptolib.common.MasterkeyFileAccess;
 
@@ -160,7 +161,7 @@ public synchronized Path create(final Session<?> session, final String region, f
         }
         final String passphrase = credentials.getPassword();
         final ByteArrayOutputStream mkArray = new ByteArrayOutputStream();
-        final Masterkey mk = Masterkey.generate(FastSecureRandomProvider.get().provide());
+        final PerpetualMasterkey mk = Masterkey.generate(FastSecureRandomProvider.get().provide());
         final MasterkeyFileAccess access = new MasterkeyFileAccess(pepper, FastSecureRandomProvider.get().provide());
         final MasterkeyFile masterkeyFile;
         try {
@@ -362,7 +363,7 @@ protected void open(final VaultConfig vaultConfig, final CharSequence passphrase
     protected void open(final VaultConfig vaultConfig, final CharSequence passphrase,
                         final CryptoFilename filenameProvider, final CryptoDirectory directoryProvider) throws BackgroundException {
         try {
-            final Masterkey masterKey = this.getMasterKey(vaultConfig.getMkfile(), passphrase);
+            final PerpetualMasterkey masterKey = this.getMasterKey(vaultConfig.getMkfile(), passphrase);
             this.open(vaultConfig, masterKey, filenameProvider, directoryProvider);
         }
         catch(IllegalArgumentException | IOException e) {
@@ -374,12 +375,12 @@ protected void open(final VaultConfig vaultConfig, final CharSequence passphrase
     }
 
     // UVF: unused?!
-    protected void open(final VaultConfig vaultConfig, final Masterkey masterKey) throws BackgroundException {
+    protected void open(final VaultConfig vaultConfig, final PerpetualMasterkey masterKey) throws BackgroundException {
         this.open(vaultConfig, masterKey, this.createFilenameProvider(vaultConfig), this.createDirectoryProvider(vaultConfig));
     }
 
     // UVF:  extract to v6/v7 imple, can we use  the new MasterKey interface from https://github.com/cryptomator/cryptolib/pull/51/files?
-    protected void open(final VaultConfig vaultConfig, final Masterkey masterKey,
+    protected void open(final VaultConfig vaultConfig, final PerpetualMasterkey masterKey,
                         final CryptoFilename filenameProvider, final CryptoDirectory directoryProvider) throws BackgroundException {
         this.vaultVersion = vaultConfig.version;
         final CryptorProvider provider = CryptorProvider.forScheme(vaultConfig.getCipherCombo());
@@ -392,7 +393,7 @@ protected void open(final VaultConfig vaultConfig, final Masterkey masterKey,
         this.nonceSize = vaultConfig.getNonceSize();
     }
 
-    private Masterkey getMasterKey(final MasterkeyFile mkFile, final CharSequence passphrase) throws IOException {
+    private PerpetualMasterkey getMasterKey(final MasterkeyFile mkFile, final CharSequence passphrase) throws IOException {
         final StringWriter writer = new StringWriter();
         mkFile.write(writer);
         return new MasterkeyFileAccess(pepper, FastSecureRandomProvider.get().provide()).load(

cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoVaultTest.java

@@ -41,7 +41,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.cryptomator.cryptolib.api.CryptorProvider;
-import org.cryptomator.cryptolib.api.Masterkey;
+import org.cryptomator.cryptolib.api.PerpetualMasterkey;
 import org.cryptomator.cryptolib.common.MasterkeyFile;
 import org.cryptomator.cryptolib.common.MasterkeyFileAccess;
 import org.junit.Test;
@@ -563,7 +563,7 @@ public static String createJWT(final String masterkeyCryptomator,
             final MasterkeyFile mkFile = MasterkeyFile.read(new StringReader(masterkeyCryptomator));
             final StringWriter writer = new StringWriter();
             mkFile.write(writer);
-            final Masterkey masterkey = new MasterkeyFileAccess(PreferencesFactory.get().getProperty("cryptomator.vault.pepper").getBytes(StandardCharsets.UTF_8),
+            final PerpetualMasterkey masterkey = new MasterkeyFileAccess(PreferencesFactory.get().getProperty("cryptomator.vault.pepper").getBytes(StandardCharsets.UTF_8),
                     FastSecureRandomProvider.get().provide()).load(new ByteArrayInputStream(writer.getBuffer().toString().getBytes(StandardCharsets.UTF_8)), passphrase);
             final Algorithm algorithm = Algorithm.HMAC256(masterkey.getEncoded());
             return JWT.create()

ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java

@@ -30,7 +30,6 @@
 import ch.cyberduck.core.cryptomator.features.CryptoReadFeature;
 import ch.cyberduck.core.cryptomator.random.FastSecureRandomProvider;
 import ch.cyberduck.core.proxy.DisabledProxyFinder;
-import ch.cyberduck.core.proxy.Proxy;
 import ch.cyberduck.core.sftp.SFTPHomeDirectoryService;
 import ch.cyberduck.core.sftp.SFTPProtocol;
 import ch.cyberduck.core.sftp.SFTPReadFeature;
@@ -56,6 +55,7 @@
 import org.cryptomator.cryptolib.api.Masterkey;
 import org.cryptomator.cryptolib.api.MasterkeyLoader;
 import org.cryptomator.cryptolib.api.MasterkeyLoadingFailedException;
+import org.cryptomator.cryptolib.api.PerpetualMasterkey;
 import org.cryptomator.cryptolib.common.MasterkeyFileAccess;
 import org.cryptomator.cryptolib.common.ReseedingSecureRandom;
 import org.junit.After;
@@ -101,7 +101,7 @@ public void startSerer() throws Exception {
             default:
                 csprng = FastSecureRandomProvider.get().provide();
         }
-        final Masterkey mk = Masterkey.generate(csprng);
+        final PerpetualMasterkey mk = Masterkey.generate(csprng);
         final MasterkeyFileAccess mkAccess = new MasterkeyFileAccess(CryptoVault.VAULT_PEPPER, csprng);
         final java.nio.file.Path mkPath = Paths.get(vault.toString(), DefaultVaultRegistry.DEFAULT_MASTERKEY_FILE_NAME);
         mkAccess.persist(mk, mkPath, passphrase);