From ad8a2ae747a4ceb480661a06e8a8820986ee224f Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Thu, 4 Nov 2021 14:56:04 +0100 Subject: [PATCH] Set TLS1.3 as enabled protocol in WebDAV-client on Android >= v10 Fixes #374 --- .../data/cloud/webdav/network/SSLSocketFactories.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/SSLSocketFactories.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/SSLSocketFactories.kt index a26ae086..604e991a 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/SSLSocketFactories.kt +++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/SSLSocketFactories.kt @@ -11,7 +11,12 @@ internal object SSLSocketFactories { fun from(trustManager: X509TrustManager): SSLSocketFactory { return try { - val sslContext = SSLContext.getInstance("TLSv1.2") + val tlsVersion = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { + "TLSv1.3" + } else { + "TLSv1.2" + } + val sslContext = SSLContext.getInstance(tlsVersion) sslContext.init(null, arrayOf(trustManager), null) sslContext.socketFactory } catch (e: GeneralSecurityException) {