mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 02:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
Armin Schrenk
2022-12-14 20:07:24 +01:00
parent e2898f0c8b c0f73a2802
commit 8009205da7
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/cryptomator/common/settings/DeviceKey.java
View File

@@ -76,6 +76,11 @@ public class DeviceKey {
private P384KeyPair createAndStoreNewKeyPair(char[] passphrase, Path p12File) throws IOException {
var keyPair = P384KeyPair.generate();
var tmpFile = p12File.resolveSibling(p12File.getFileName().toString() + ".tmp");
if(Files.exists(tmpFile)) {
LOG.debug("Leftover from devicekey creation detected. Deleting {}", tmpFile);
Files.delete(tmpFile);
}
LOG.debug("Store new device key to {}", p12File);
keyPair.store(p12File, passphrase);
return keyPair;