Преглед изворни кода

Merge branch 'develop' into feature/jdk19

Sebastian Stenzel пре 2 година
родитељ
комит
70e5f53009
2 измењених фајлова са 6 додато и 4 уклоњено
  1. 2 2
      pom.xml
  2. 4 2
      src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java

+ 2 - 2
pom.xml

@@ -28,7 +28,7 @@
 
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptolib.version>2.1.0-rc1</cryptomator.cryptolib.version>
-		<cryptomator.cryptofs.version>2.4.4</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.4.5</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.1.0</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.1.2</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.1.2</cryptomator.integrations.mac.version>
@@ -44,7 +44,7 @@
 		<guava.version>31.1-jre</guava.version>
 		<gson.version>2.9.1</gson.version>
 		<javafx.version>18.0.2</javafx.version>
-		<jwt.version>4.0.0</jwt.version>
+		<jwt.version>4.2.1</jwt.version>
 		<nimbus-jose.version>9.25.4</nimbus-jose.version>
 		<logback.version>1.4.4</logback.version>
 		<slf4j.version>2.0.3</slf4j.version>

+ 4 - 2
src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java

@@ -56,8 +56,10 @@ public abstract class HubKeyLoadingModule {
 	@Named("deviceId")
 	static String provideDeviceId(DeviceKey deviceKey) {
 		var publicKey = Objects.requireNonNull(deviceKey.get()).getPublic().getEncoded();
-		var hashedKey = MessageDigestSupplier.SHA256.get().digest(publicKey);
-		return BaseEncoding.base16().encode(hashedKey);
+		try (var instance = MessageDigestSupplier.SHA256.instance()) {
+			var hashedKey = instance.get().digest(publicKey);
+			return BaseEncoding.base16().encode(hashedKey);
+		}
 	}
 
 	@Provides