Merge branch 'release/1.1.1' into main

# Conflicts:
#	pom.xml

Author: overheadhunter

.github/workflows/build.yml

@@ -7,6 +7,7 @@ jobs:
   build:
     name: Build and Test
     runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     env:
       BUILD_VERSION: SNAPSHOT
     outputs:
@@ -32,7 +33,7 @@ jobs:
         id: setversion
         run: |
           v=$(mvn help:evaluate "-Dexpression=project.version" -q -DforceStdout)
-          echo "::set-env name=BUILD_VERSION::${v}"
+          echo "BUILD_VERSION=${v}" >> $GITHUB_ENV
           echo "::set-output name=version::${v}"
       - name: Build and Test
         run: mvn -B install

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cryptomator</groupId>
     <artifactId>cloud-access</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
 
     <name>Cryptomator CloudAccess in Java</name>
     <description>CloudAccess is used in e.g. Cryptomator for Android to access different cloud providers.</description>

src/main/java/org/cryptomator/cloudaccess/CloudAccess.java

@@ -73,8 +73,8 @@ private static void verifyVaultFormat8GCMConfig(CloudProvider cloudProvider, Clo
 		var vaultConfigPath = pathToVault.resolve("vaultconfig.jwt");
 		var algorithm = Algorithm.HMAC256(rawKey);
 		var verifier = JWT.require(algorithm)
-				.withClaim("version", 8)
-				.withClaim("ciphermode", "SIV_GCM")
+				.withClaim("format", 8)
+				.withClaim("cipherCombo", "SIV_GCM")
 				.build();
 
 		var read = cloudProvider.read(vaultConfigPath, ProgressListener.NO_PROGRESS_AWARE);
@@ -85,7 +85,7 @@ private static void verifyVaultFormat8GCMConfig(CloudProvider cloudProvider, Clo
 		} catch (SignatureVerificationException e) {
 			throw new VaultKeyVerificationFailedException(e);
 		} catch (JWTVerificationException e) {
-			if (e.getMessage().equals("The Claim 'version' value doesn't match the required one.")) {
+			if (e.getMessage().equals("The Claim 'format' value doesn't match the required one.")) {
 				throw new VaultVersionVerificationFailedException(e);
 			} else {
 				throw new VaultVerificationFailedException(e);

src/test/java/org/cryptomator/cloudaccess/vaultformat8/VaultFormat8IntegrationTest.java

@@ -76,8 +76,8 @@ public void testInstantiateFormat8GCMCloudAccessWithWrongVaultVersion() {
 		Algorithm algorithm = Algorithm.HMAC256(masterkey);
 		var token = JWT.create()
 				.withJWTId(UUID.randomUUID().toString())
-				.withClaim("version", 9)
-				.withClaim("ciphermode", "SIV_GCM")
+				.withClaim("format", 9)
+				.withClaim("cipherCombo", "SIV_GCM")
 				.sign(algorithm);
 		var in = new ByteArrayInputStream(token.getBytes(StandardCharsets.US_ASCII));
 		localProvider.write(CloudPath.of("/vaultconfig.jwt"), false, in, in.available(), Optional.empty(), ProgressListener.NO_PROGRESS_AWARE).toCompletableFuture().join();
@@ -92,8 +92,8 @@ public void testInstantiateFormat8GCMCloudAccessWithWrongCiphermode() {
 		Algorithm algorithm = Algorithm.HMAC256(masterkey);
 		var token = JWT.create()
 				.withJWTId(UUID.randomUUID().toString())
-				.withClaim("version", 8)
-				.withClaim("ciphermode", "FOO")
+				.withClaim("format", 8)
+				.withClaim("cipherCombo", "FOO")
 				.sign(algorithm);
 		var in = new ByteArrayInputStream(token.getBytes(StandardCharsets.US_ASCII));
 		localProvider.write(CloudPath.of("/vaultconfig.jwt"), false, in, in.available(), Optional.empty(), ProgressListener.NO_PROGRESS_AWARE).toCompletableFuture().join();
@@ -109,8 +109,8 @@ public void testInstantiateFormat8GCMCloudAccessWithWrongKey() {
 		Algorithm algorithm = Algorithm.HMAC256(masterkey);
 		var token = JWT.create()
 				.withJWTId(UUID.randomUUID().toString())
-				.withClaim("version", 8)
-				.withClaim("ciphermode", "FOO")
+				.withClaim("format", 8)
+				.withClaim("cipherCombo", "FOO")
 				.sign(algorithm);
 		var in = new ByteArrayInputStream(token.getBytes(StandardCharsets.US_ASCII));
 		localProvider.write(CloudPath.of("/vaultconfig.jwt"), false, in, in.available(), Optional.empty(), ProgressListener.NO_PROGRESS_AWARE).toCompletableFuture().join();

src/test/resources/vaultconfig.jwt

@@ -1 +1 @@
-eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjaXBoZXJtb2RlIjoiU0lWX0dDTSIsInZlcnNpb24iOjgsImp0aSI6IjQwNDJiMTk5LTg5ZmItNDA1NC05NDJlLTc0MjEyODBjOTY1OSJ9.b_5phqmQogpsnVeU4tAcug2zuvh37XcYxieBK-L6ZTE
+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjaXBoZXJDb21ibyI6IlNJVl9HQ00iLCJmb3JtYXQiOjgsImp0aSI6IjExMTExMTExLTIyMjItMzMzMy00NDQ0LTU1NTU1NTU1NTU1NSJ9.3vSf-eTUoJU8AppBc_sn1TEiGhnUn3Ds_4qT9L0sQ6o