From 0376447db56fc2ccd3471f8f1f0f3c0321508c9f Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 14 Sep 2023 16:20:01 +0200
Subject: [PATCH 01/10] rename integration test

---
 ...java => WindowsProtectedKeychainAccessIntegrationTest.java} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename src/test/java/org/cryptomator/windows/keychain/{KeychainAccessProviderTest.java => WindowsProtectedKeychainAccessIntegrationTest.java} (96%)

diff --git a/src/test/java/org/cryptomator/windows/keychain/KeychainAccessProviderTest.java b/src/test/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccessIntegrationTest.java
similarity index 96%
rename from src/test/java/org/cryptomator/windows/keychain/KeychainAccessProviderTest.java
rename to src/test/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccessIntegrationTest.java
index d1fa894..69d1eb9 100644
--- a/src/test/java/org/cryptomator/windows/keychain/KeychainAccessProviderTest.java
+++ b/src/test/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccessIntegrationTest.java
@@ -13,9 +13,8 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Objects;
 
-public class KeychainAccessProviderTest {
+public class WindowsProtectedKeychainAccessIntegrationTest {
 
 	@BeforeAll
 	public static void setup(@TempDir Path tmpDir) {

From e2027cd79f64afd201dc8fedffe82bd7fbdb2996 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 14 Sep 2023 16:30:30 +0200
Subject: [PATCH 02/10] new IDE setting [ci skip]

---
 .idea/misc.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 482738c..a8fc129 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>

From ffa68589c668f4bfff32828d6aa582bf184934d2 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 14 Sep 2023 16:31:09 +0200
Subject: [PATCH 03/10] first impl with explicit byte array conversion

---
 pom.xml                                       | 17 ++++---
 src/main/java/module-info.java                |  5 +-
 .../keychain/ByteArrayJsonAdapter.java        | 46 ++++++++++++-------
 .../windows/keychain/KeychainEntry.java       | 18 +++++---
 .../WindowsProtectedKeychainAccess.java       | 40 ++++++++--------
 5 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/pom.xml b/pom.xml
index 30a7fd3..b53a1aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
         <!-- runtime dependencies -->
         <api.version>1.2.0</api.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <gson.version>2.9.0</gson.version>
+		<jackson.version>2.15.2</jackson.version>
 
         <!-- test dependencies -->
 		<junit.jupiter.version>5.8.2</junit.jupiter.version>
@@ -69,11 +69,16 @@
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
 
         <!-- JUnit / Mockito / Hamcrest -->
         <dependency>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 1e6e53a..97af1f7 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -10,9 +10,10 @@
 module org.cryptomator.integrations.win {
 	requires org.cryptomator.integrations.api;
 	requires org.slf4j;
-	requires com.google.gson;
+	requires com.fasterxml.jackson.annotation;
+	requires com.fasterxml.jackson.databind;
 
-	opens org.cryptomator.windows.keychain to com.google.gson;
+	opens org.cryptomator.windows.keychain to com.fasterxml.jackson.databind;
 
 	provides AutoStartProvider with WindowsAutoStart;
 	provides KeychainAccessProvider with WindowsProtectedKeychainAccess;
diff --git a/src/main/java/org/cryptomator/windows/keychain/ByteArrayJsonAdapter.java b/src/main/java/org/cryptomator/windows/keychain/ByteArrayJsonAdapter.java
index 0761e36..6444373 100644
--- a/src/main/java/org/cryptomator/windows/keychain/ByteArrayJsonAdapter.java
+++ b/src/main/java/org/cryptomator/windows/keychain/ByteArrayJsonAdapter.java
@@ -1,26 +1,40 @@
 package org.cryptomator.windows.keychain;
 
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-import java.lang.reflect.Type;
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
 import java.util.Base64;
 
-class ByteArrayJsonAdapter implements JsonSerializer<byte[]>, JsonDeserializer<byte[]> {
+class ByteArrayJsonAdapter {
+	static class Serializer extends StdSerializer<byte[]> {
+
+		public Serializer() {
+			super((Class<byte[]>) null);
+		}
 
-	@Override
-	public byte[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-		return Base64.getDecoder().decode(json.getAsString());
+		@Override
+		public void serialize(byte[] value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+			gen.writeString(Base64.getEncoder().encodeToString(value));
+		}
 	}
 
-	@Override
-	public JsonElement serialize(byte[] src, Type typeOfSrc, JsonSerializationContext context) {
-		return new JsonPrimitive(Base64.getEncoder().encodeToString(src));
+	static class Deserializer extends StdDeserializer<byte[]> {
+
+		public Deserializer() {
+			super(byte[].class);
+		}
+
+		@Override
+		public byte[] deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException {
+			String base64 = p.getValueAsString();
+			return Base64.getDecoder().decode(base64);
+		}
 	}
 
 }
diff --git a/src/main/java/org/cryptomator/windows/keychain/KeychainEntry.java b/src/main/java/org/cryptomator/windows/keychain/KeychainEntry.java
index 7a22db5..0e00f49 100644
--- a/src/main/java/org/cryptomator/windows/keychain/KeychainEntry.java
+++ b/src/main/java/org/cryptomator/windows/keychain/KeychainEntry.java
@@ -1,12 +1,16 @@
 package org.cryptomator.windows.keychain;
 
-import com.google.gson.annotations.SerializedName;
 
-class KeychainEntry {
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-	@SerializedName("ciphertext")
-	byte[] ciphertext;
-	
-	@SerializedName("salt")
-	byte[] salt;
+record KeychainEntry(@JsonProperty("ciphertext") //
+					 @JsonSerialize(using = ByteArrayJsonAdapter.Serializer.class) //
+					 @JsonDeserialize(using = ByteArrayJsonAdapter.Deserializer.class) //
+					 byte[] ciphertext,
+					 @JsonProperty("salt") //
+					 @JsonSerialize(using = ByteArrayJsonAdapter.Serializer.class) //
+					 @JsonDeserialize(using = ByteArrayJsonAdapter.Deserializer.class) //
+					 byte[] salt) {
 }
diff --git a/src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java b/src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java
index 9e3e591..333f2cb 100644
--- a/src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java
+++ b/src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java
@@ -1,9 +1,8 @@
 package org.cryptomator.windows.keychain;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.cryptomator.integrations.common.OperatingSystem;
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
@@ -19,7 +18,6 @@
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
-import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.file.Files;
@@ -49,11 +47,7 @@ public class WindowsProtectedKeychainAccess implements KeychainAccessProvider {
 	private static final Logger LOG = LoggerFactory.getLogger(WindowsProtectedKeychainAccess.class);
 	private static final Path USER_HOME_REL = Path.of("~");
 	private static final Path USER_HOME = Path.of(System.getProperty("user.home"));
-	private static final Gson GSON = new GsonBuilder() //
-			.setPrettyPrinting() //
-			.registerTypeHierarchyAdapter(byte[].class, new ByteArrayJsonAdapter()) //
-			.disableHtmlEscaping() //
-			.create();
+	private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
 
 	private final List<Path> keychainPaths;
 	private final WinDataProtection dataProtection;
@@ -103,12 +97,11 @@ public void storePassphrase(String key, String displayName, CharSequence passphr
 		ByteBuffer buf = UTF_8.encode(CharBuffer.wrap(passphrase));
 		byte[] cleartext = new byte[buf.remaining()];
 		buf.get(cleartext);
-		KeychainEntry entry = new KeychainEntry();
-		entry.salt = generateSalt();
-		entry.ciphertext = dataProtection.protect(cleartext, entry.salt);
+		var salt = generateSalt();
+		var ciphertext = dataProtection.protect(cleartext, salt);
 		Arrays.fill(buf.array(), (byte) 0x00);
 		Arrays.fill(cleartext, (byte) 0x00);
-		keychainEntries.put(key, entry);
+		keychainEntries.put(key, new KeychainEntry(ciphertext, salt));
 		saveKeychainEntries();
 	}
 
@@ -119,7 +112,7 @@ public char[] loadPassphrase(String key) throws KeychainAccessException {
 		if (entry == null) {
 			return null;
 		}
-		byte[] cleartext = dataProtection.unprotect(entry.ciphertext, entry.salt);
+		byte[] cleartext = dataProtection.unprotect(entry.ciphertext(), entry.salt());
 		if (cleartext == null) {
 			return null;
 		}
@@ -184,15 +177,18 @@ private void loadKeychainEntriesIfNeeded() throws KeychainAccessException {
 	//visible for testing
 	Optional<Map<String, KeychainEntry>> loadKeychainEntries(Path keychainPath) throws KeychainAccessException {
 		LOG.debug("Attempting to load keychain from {}", keychainPath);
-		Type type = new TypeToken<Map<String, KeychainEntry>>() {
-		}.getType();
+		TypeReference<Map<String, KeychainEntry>> type = new TypeReference<>() {
+		};
 		try (InputStream in = Files.newInputStream(keychainPath, StandardOpenOption.READ); //
 			 Reader reader = new InputStreamReader(in, UTF_8)) {
-			return Optional.ofNullable(GSON.fromJson(reader, type));
-		} catch (NoSuchFileException | JsonParseException e) {
+			return Optional.ofNullable(JSON_MAPPER.readValue(reader, type));
+		} catch (NoSuchFileException | JacksonException e) {
+			if (e instanceof JacksonException) {
+				LOG.warn("Unable to parse keychain file, overwriting existing one.");
+			}
 			return Optional.empty();
-		} catch (IOException e) {
-			throw new KeychainAccessException("Could not read keychain from path " + keychainPath, e);
+		} catch (IOException ioe) {
+			throw new KeychainAccessException("Could not read keychain from path " + keychainPath, ioe);
 		}
 	}
 
@@ -206,7 +202,7 @@ private void saveKeychainEntries() throws KeychainAccessException {
 	private void saveKeychainEntries(Path keychainPath) throws KeychainAccessException {
 		try (OutputStream out = Files.newOutputStream(keychainPath, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); //
 			 Writer writer = new OutputStreamWriter(out, UTF_8)) {
-			GSON.toJson(keychainEntries, writer);
+			JSON_MAPPER.writeValue(writer, keychainEntries);
 		} catch (IOException e) {
 			throw new KeychainAccessException("Could not read keychain from path " + keychainPath, e);
 		}

From b4827ff2d7d0eed0d40f95d0f564060de92a2f77 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 14 Sep 2023 16:59:03 +0200
Subject: [PATCH 04/10] rely on default jackson mapper settings

---
 .../keychain/ByteArrayJsonAdapter.java        | 40 -------------------
 .../windows/keychain/KeychainEntry.java       | 11 +----
 ...rotectedKeychainAccessIntegrationTest.java | 10 +++++
 .../windows/keychain/keychain.v1.2.2.json     | 14 +++++++
 4 files changed, 25 insertions(+), 50 deletions(-)
 delete mode 100644 src/main/java/org/cryptomator/windows/keychain/ByteArrayJsonAdapter.java
 create mode 100644 src/test/resources/org/cryptomator/windows/keychain/keychain.v1.2.2.json

diff --git a/src/main/java/org/cryptomator/windows/keychain/ByteArrayJsonAdapter.java b/src/main/java/org/cryptomator/windows/keychain/ByteArrayJsonAdapter.java
deleted file mode 100644
index 6444373..0000000
--- a/src/main/java/org/cryptomator/windows/keychain/ByteArrayJsonAdapter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.cryptomator.windows.keychain;
-
-import com.fasterxml.jackson.core.JacksonException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.util.Base64;
-
-class ByteArrayJsonAdapter {
-	static class Serializer extends StdSerializer<byte[]> {
-
-		public Serializer() {
-			super((Class<byte[]>) null);
-		}
-
-		@Override
-		public void serialize(byte[] value, JsonGenerator gen, SerializerProvider provider) throws IOException {
-			gen.writeString(Base64.getEncoder().encodeToString(value));
-		}
-	}
-
-	static class Deserializer extends StdDeserializer<byte[]> {
-
-		public Deserializer() {
-			super(byte[].class);
-		}
-
-		@Override
-		public byte[] deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException {
-			String base64 = p.getValueAsString();
-			return Base64.getDecoder().decode(base64);
-		}
-	}
-
-}
diff --git a/src/main/java/org/cryptomator/windows/keychain/KeychainEntry.java b/src/main/java/org/cryptomator/windows/keychain/KeychainEntry.java
index 0e00f49..fd295f1 100644
--- a/src/main/java/org/cryptomator/windows/keychain/KeychainEntry.java
+++ b/src/main/java/org/cryptomator/windows/keychain/KeychainEntry.java
@@ -2,15 +2,6 @@
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-record KeychainEntry(@JsonProperty("ciphertext") //
-					 @JsonSerialize(using = ByteArrayJsonAdapter.Serializer.class) //
-					 @JsonDeserialize(using = ByteArrayJsonAdapter.Deserializer.class) //
-					 byte[] ciphertext,
-					 @JsonProperty("salt") //
-					 @JsonSerialize(using = ByteArrayJsonAdapter.Serializer.class) //
-					 @JsonDeserialize(using = ByteArrayJsonAdapter.Deserializer.class) //
-					 byte[] salt) {
+record KeychainEntry(@JsonProperty("ciphertext") byte[] ciphertext, @JsonProperty("salt") byte[] salt) {
 }
diff --git a/src/test/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccessIntegrationTest.java b/src/test/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccessIntegrationTest.java
index 69d1eb9..c948440 100644
--- a/src/test/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccessIntegrationTest.java
+++ b/src/test/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccessIntegrationTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -58,6 +59,15 @@ public void testEmptyFileReturnsEmpty() throws KeychainAccessException, IOExcept
 
 			Assertions.assertTrue(result.isEmpty());
 		}
+
+		@Test
+		public void testLegacyKeychainFiles() throws URISyntaxException, KeychainAccessException {
+			var keychainPath = Path.of(this.getClass().getResource("keychain.v1.2.2.json").toURI());
+			var result = keychainAccess.loadKeychainEntries(keychainPath);
+
+			Assertions.assertTrue(result.isPresent());
+			Assertions.assertEquals(3, result.get().size());
+		}
 	}
 
 }
diff --git a/src/test/resources/org/cryptomator/windows/keychain/keychain.v1.2.2.json b/src/test/resources/org/cryptomator/windows/keychain/keychain.v1.2.2.json
new file mode 100644
index 0000000..4f12b0a
--- /dev/null
+++ b/src/test/resources/org/cryptomator/windows/keychain/keychain.v1.2.2.json
@@ -0,0 +1,14 @@
+{
+  "cryptomator-device-p12": {
+    "ciphertext": "AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAMKzd7acJg0ScvBUOCjUb3wAAAAACAAAAAAAQZgAAAAEAACAAAABS6cSKuWqEOp+1HHcsSF0bSzQRRbotDIZPQIuMvbSdowAAAAAOgAAAAAIAACAAAABatZ2hp39vFTysmXRSO1rkk9vLx2S6rnRq6RIGkXlCnzAAAAAgTeOMtOKhnMzIjSwJEFE22UaB3sPGH6UxQ+EWMuZ9WPGHmOp8/WzTzFLCwbiIh9ZAAAAAf7DQSu40eCLUDKQzwFNJrBJsEWX2pK2GS2wOYFTlcMhSij7WkSHh9nAeZtRf14PyBpuLxCiBIayLJMpeK4HIXg==",
+    "salt": "Rwzfb0IHSqOXJw5MGRmCTw=="
+  },
+  "-JgknuFBfItX": {
+    "ciphertext": "AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAMKzd7acJg0ScvBUOCjUb3wAAAAACAAAAAAAQZgAAAAEAACAAAABnYHm42qCU6kq50NV16IqJbrwrRwagpiYgopjK8xpyVAAAAAAOgAAAAAIAACAAAAC6XB/vmPRR7tK5sTOyY6DFgTXv4/ptTzGsKwJEsn1I8xAAAADUlPA6Qet/WSCbdK4WShMsQAAAAOVsW/9E/YNwHLl/qyzffkp2YR7UKeTcM3EkLoyI9Q2RJjmdidJc4wAet9zlp4qUPST+ukTxXAvMW/+RNxEAeZM=",
+    "salt": "CqEUWMVSQtqsDNhKeNCZHg=="
+  },
+  "vkEAWUv_NmbN": {
+    "ciphertext": "AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAcLFOdGbRSEiT1nQ2ILvP/gAAAAACAAAAAAAQZgAAAAEAACAAAABYjK3wVUE/is3SHpdzLRaijVbLw6UYMSBizyiDDWNrqAAAAAAOgAAAAAIAACAAAAALkAoBV3/RwpSXwkTyDgOKiR7+wMnXq099WW4tt873NRAAAACH2Ki+R4fSi+569Y0RpoS0QAAAAEXbbfM0mUuIgajCfO7yfH1ysWdRUWfZYnfqDjeR5Up/FKqLbPkgZr+0fgb/sZEw+HyQ781A7+fXHFqB3hQoDV0=",
+    "salt": "evllr3H5SHyJN/1SciqlVQ=="
+  }
+}
\ No newline at end of file

From 0872aec65fff6b2764ba8454f0a1157ee2e69ad3 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 15 Sep 2023 11:29:55 +0200
Subject: [PATCH 05/10] Apply suggestions from code review

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
---
 .../keychain/WindowsProtectedKeychainAccess.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java b/src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java
index 333f2cb..abb71f1 100644
--- a/src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java
+++ b/src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java
@@ -182,13 +182,13 @@ Optional<Map<String, KeychainEntry>> loadKeychainEntries(Path keychainPath) thro
 		try (InputStream in = Files.newInputStream(keychainPath, StandardOpenOption.READ); //
 			 Reader reader = new InputStreamReader(in, UTF_8)) {
 			return Optional.ofNullable(JSON_MAPPER.readValue(reader, type));
-		} catch (NoSuchFileException | JacksonException e) {
-			if (e instanceof JacksonException) {
-				LOG.warn("Unable to parse keychain file, overwriting existing one.");
-			}
+		} catch (NoSuchFileException e) {
+			return Optional.empty();
+		} catch (JacksonException je) {
+			LOG.warn("Unable to parse keychain file, overwriting existing one.");
 			return Optional.empty();
-		} catch (IOException ioe) {
-			throw new KeychainAccessException("Could not read keychain from path " + keychainPath, ioe);
+		} catch (IOException e) {
+			throw new KeychainAccessException("Could not read keychain from path " + keychainPath, e);
 		}
 	}
 

From 9cde26fb4f1f5ce8e73f5bf1e860c94da13ed16d Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 19 Sep 2023 10:44:12 +0200
Subject: [PATCH 06/10] add dependabot config

---
 .github/dependabot.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..505ccc1
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,22 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "06:00"
+      timezone: "UTC"
+    groups:
+      maven-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "github-actions"
+    directory: "/" # even for `.github/workflows`
+    schedule:
+      interval: "monthly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
\ No newline at end of file

From e6ca404a48d21a584a0c59a1fcfa5d08605ea781 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 19 Sep 2023 10:55:58 +0200
Subject: [PATCH 07/10] only sign dlls on release

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 58ee700..23eef5d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,8 @@ jobs:
       - name: Build and Test
         id: buildAndTest
         run: mvn -B clean test -Pdependency-check
-      - name: Codesign DLL
+      - name: Codesign DLL on release
+        if: startsWith(github.ref, 'refs/tags/')
         uses: skymatic/code-sign-action@v2
         with:
           certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }}

From 9725f4b53bbe815f90a9568675d586d6cb523c57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 09:01:58 +0000
Subject: [PATCH 08/10] Bump the github-actions group with 1 update (#24)

---
 .github/workflows/build.yml           | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/publish-central.yml | 2 +-
 .github/workflows/publish-github.yml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 23eef5d..846b4ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: windows-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ae1912a..478a03a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: windows-2019
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 2
     - uses: actions/setup-java@v3
diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml
index 150b20c..2d6097c 100644
--- a/.github/workflows/publish-central.yml
+++ b/.github/workflows/publish-central.yml
@@ -15,7 +15,7 @@ jobs:
   publish:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: "refs/tags/${{ github.event.inputs.tag }}"
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml
index a24a7bb..f807715 100644
--- a/.github/workflows/publish-github.yml
+++ b/.github/workflows/publish-github.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: windows-latest
     if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

From 9497d49519fb9a928c1d8a53a4915e480d8ef356 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 09:26:17 +0000
Subject: [PATCH 09/10] Bump the maven-dependencies group with 17 updates (#25)

---
 pom.xml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index b53a1aa..4328f04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,17 +37,17 @@
 		<project.jdk.version>17</project.jdk.version>
 
         <!-- runtime dependencies -->
-        <api.version>1.2.0</api.version>
-        <slf4j.version>1.7.36</slf4j.version>
+        <api.version>1.3.0</api.version>
+        <slf4j.version>2.0.9</slf4j.version>
 		<jackson.version>2.15.2</jackson.version>
 
         <!-- test dependencies -->
-		<junit.jupiter.version>5.8.2</junit.jupiter.version>
-		<mockito.version>4.4.0</mockito.version>
+		<junit.jupiter.version>5.10.0</junit.jupiter.version>
+		<mockito.version>5.5.0</mockito.version>
 
 		<!-- build plugin dependencies -->
-		<dependency-check.version>8.1.0</dependency-check.version>
-		<nexus-staging.version>1.6.8</nexus-staging.version>
+		<dependency-check.version>8.4.0</dependency-check.version>
+		<nexus-staging.version>1.6.13</nexus-staging.version>
     </properties>
 
     <licenses>
@@ -106,7 +106,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.3.1</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -122,7 +122,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <compilerArgs>
                         <arg>-h</arg>
@@ -134,7 +134,7 @@
             <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>3.4.1</version>
 				<executions>
 					<execution>
 						<id>check-preconditions</id>
@@ -154,7 +154,7 @@
 			</plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>copy-dlls</id>
@@ -180,11 +180,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M5</version>
+                <version>3.1.2</version>
             </plugin>
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -196,7 +196,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -279,7 +279,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>3.0.0</version>
+						<version>3.1.0</version>
 						<executions>
 							<execution>
 								<goals>
@@ -309,7 +309,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.0.1</version>
+						<version>3.1.0</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -370,7 +370,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.1.0</version>
+						<version>3.1.1</version>
 					</plugin>
 				</plugins>
 			</build>

From 4d4676c5a69f29eca3e3fb4baed5f6b4e4e20e7d Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 19 Sep 2023 11:38:51 +0200
Subject: [PATCH 10/10] prepare 1.2.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4328f04..6a20da9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cryptomator</groupId>
     <artifactId>integrations-win</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.3</version>
 
     <name>Cryptomator Integrations for Windows</name>
     <description>Provides optional Windows services used by Cryptomator</description>