From 3dcebb1e1f8e84b8f8abdbf3ccbbcfe9b2b6b9fc Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sun, 22 May 2016 13:32:16 +0200 Subject: [PATCH] fixed minor copy/paste error --- .../java/org/cryptomator/crypto/engine/impl/CryptorImpl.java | 2 +- .../cryptomator/crypto/engine/impl/ThreadLocalAesCtrCipher.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java index aaa099cb9..b0b90cdbe 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java @@ -86,7 +86,7 @@ class CryptorImpl implements Cryptor { randomSource.nextBytes(randomBytes); encryptionKey = new SecretKeySpec(randomBytes, ENCRYPTION_ALG); randomSource.nextBytes(randomBytes); - macKey = new SecretKeySpec(randomBytes, ENCRYPTION_ALG); + macKey = new SecretKeySpec(randomBytes, MAC_ALG); } finally { Arrays.fill(randomBytes, (byte) 0x00); } diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/ThreadLocalAesCtrCipher.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/ThreadLocalAesCtrCipher.java index b084ef9d1..f54676282 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/ThreadLocalAesCtrCipher.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/ThreadLocalAesCtrCipher.java @@ -25,7 +25,7 @@ final class ThreadLocalAesCtrCipher { try { return Cipher.getInstance(AES_CTR); } catch (NoSuchAlgorithmException | NoSuchPaddingException e) { - throw new IllegalStateException("Could not create MAC.", e); + throw new IllegalStateException("Could not create Cipher.", e); } }