AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Set TLS1.3 as enabled protocol in WebDAV-client on Android >= v10

Browse Source 
Fixes #374
This commit is contained in:
Julian Raufelder 2021-11-04 14:56:04 +01:00
parent b398a008b0
commit ad8a2ae747
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/src/main/java/org/cryptomator/data/cloud/webdav/network/SSLSocketFactories.kt
View File

@ -11,7 +11,12 @@ internal object SSLSocketFactories {
fun from(trustManager: X509TrustManager): SSLSocketFactory { fun from(trustManager: X509TrustManager): SSLSocketFactory {
return try { 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>(trustManager), null) sslContext.init(null, arrayOf<TrustManager>(trustManager), null)
sslContext.socketFactory sslContext.socketFactory
} catch (e: GeneralSecurityException) { } catch (e: GeneralSecurityException) {