mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 01:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/1.2.2'

Browse Source
This commit is contained in:
Sebastian Stenzel
2016-11-12 17:02:04 +01:00
parent 2bc6fe89ad bac1d6fd83
commit 3db757193e
20 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/ant-kit/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>ant-kit</artifactId>
<packaging>pom</packaging>

2
main/commons-test/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>commons-test</artifactId>
<name>Cryptomator common test dependencies</name>

2
main/commons/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>commons</artifactId>
<name>Cryptomator common</name>

2
main/filesystem-api/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>filesystem-api</artifactId>
<name>Cryptomator filesystem: API</name>

2
main/filesystem-charsets/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>filesystem-charsets</artifactId>
<name>Cryptomator filesystem: Charset compatibility layer</name>

2
main/filesystem-crypto-integration-tests/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>filesystem-crypto-integration-tests</artifactId>
<name>Cryptomator filesystem: Encryption layer tests</name>

4
main/filesystem-crypto/pom.xml
View File

@@ -12,14 +12,14 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>filesystem-crypto</artifactId>
<name>Cryptomator filesystem: Encryption layer</name>
<properties>
<bouncycastle.version>1.51</bouncycastle.version>
<sivmode.version>1.0.8</sivmode.version>
<sivmode.version>1.2.0</sivmode.version>
</properties>
<dependencies>

4
main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java
View File

@@ -14,7 +14,6 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.regex.Pattern;
import javax.crypto.AEADBadTagException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.SecretKey;
@@ -23,6 +22,7 @@ import org.apache.commons.codec.binary.BaseNCodec;
import org.cryptomator.crypto.engine.AuthenticationFailedException;
import org.cryptomator.crypto.engine.FilenameCryptor;
import org.cryptomator.siv.SivMode;
import org.cryptomator.siv.UnauthenticCiphertextException;
class FilenameCryptorImpl implements FilenameCryptor {
@@ -71,7 +71,7 @@ class FilenameCryptorImpl implements FilenameCryptor {
try {
final byte[] cleartextBytes = AES_SIV.get().decrypt(encryptionKey, macKey, encryptedBytes, associatedData);
return new String(cleartextBytes, UTF_8);
} catch (AEADBadTagException | IllegalBlockSizeException e) {
} catch (UnauthenticCiphertextException | IllegalBlockSizeException e) {
throw new AuthenticationFailedException("Invalid ciphertext.", e);
}
}

2
main/filesystem-inmemory/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>filesystem-inmemory</artifactId>
<name>Cryptomator filesystem: In-memory mock</name>

2
main/filesystem-invariants-tests/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>filesystem-invariants-tests</artifactId>
<name>Cryptomator filesystem: Invariants tests</name>

2
main/filesystem-nameshortening/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>filesystem-nameshortening</artifactId>
<name>Cryptomator filesystem: Name shortening layer</name>

2
main/filesystem-nio/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>filesystem-nio</artifactId>
<name>Cryptomator filesystem: NIO-based physical layer</name>

2
main/filesystem-stats/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>filesystem-stats</artifactId>
<name>Cryptomator filesystem: Throughput statistics</name>

2
main/frontend-api/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>frontend-api</artifactId>
<name>Cryptomator frontend: API</name>

2
main/frontend-webdav/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>frontend-webdav</artifactId>
<name>Cryptomator frontend: WebDAV frontend</name>

2
main/jacoco-report/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>jacoco-report</artifactId>
<name>Cryptomator Code Coverage Report</name>

2
main/keychain/pom.xml
View File

@@ -3,7 +3,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>keychain</artifactId>
<name>System Keychain Access</name>

2
main/pom.xml
View File

@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
<packaging>pom</packaging>
<name>Cryptomator</name>

2
main/uber-jar/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>uber-jar</artifactId>
<packaging>pom</packaging>

2
main/ui/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<artifactId>ui</artifactId>
<name>Cryptomator GUI</name>