mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-30 19:56:00 +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
dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml
Vendored
+1
View File
@@ -66,6 +66,7 @@
</content_rating> </content_rating>
<releases> <releases>
<release date="2022-12-14" version="1.6.17"/>
<release date="2022-12-06" version="1.6.16"/> <release date="2022-12-06" version="1.6.16"/>
<release date="2022-10-06" version="1.6.15"/> <release date="2022-10-06" version="1.6.15"/>
<release date="2022-08-31" version="1.6.14"/> <release date="2022-08-31" version="1.6.14"/>
pom.xml
+7
View File
@@ -27,6 +27,7 @@
<nonModularGroupIds>com.github.serceman,com.github.jnr,org.ow2.asm,net.java.dev.jna,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh</nonModularGroupIds> <nonModularGroupIds>com.github.serceman,com.github.jnr,org.ow2.asm,net.java.dev.jna,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh</nonModularGroupIds>
<!-- cryptomator dependencies --> <!-- cryptomator dependencies -->
<cryptomator.cryptolib.version>2.1.1</cryptomator.cryptolib.version>
<cryptomator.cryptofs.version>2.5.3</cryptomator.cryptofs.version> <cryptomator.cryptofs.version>2.5.3</cryptomator.cryptofs.version>
<cryptomator.integrations.version>1.2.0-beta1</cryptomator.integrations.version> <cryptomator.integrations.version>1.2.0-beta1</cryptomator.integrations.version>
<cryptomator.integrations.win.version>1.1.2</cryptomator.integrations.win.version> <cryptomator.integrations.win.version>1.1.2</cryptomator.integrations.win.version>
@@ -63,6 +64,12 @@
<dependencies> <dependencies>
<!-- Cryptomator Libs --> <!-- Cryptomator Libs -->
<dependency>
<!-- needed due to https://github.com/cryptomator/cryptolib/issues/34-->
<groupId>org.cryptomator</groupId>
<artifactId>cryptolib</artifactId>
<version>${cryptomator.cryptolib.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.cryptomator</groupId> <groupId>org.cryptomator</groupId>
<artifactId>cryptofs</artifactId> <artifactId>cryptofs</artifactId>
src/main/java/org/cryptomator/common/settings/DeviceKey.java
+5
View File
@@ -76,6 +76,11 @@ public class DeviceKey {
private P384KeyPair createAndStoreNewKeyPair(char[] passphrase, Path p12File) throws IOException { private P384KeyPair createAndStoreNewKeyPair(char[] passphrase, Path p12File) throws IOException {
var keyPair = P384KeyPair.generate(); 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); LOG.debug("Store new device key to {}", p12File);
keyPair.store(p12File, passphrase); keyPair.store(p12File, passphrase);
return keyPair; return keyPair;