From aae3518bb90a4a60d14ef50b92355dc14b0e6853 Mon Sep 17 00:00:00 2001 From: Albert Vaca Cintora Date: Sun, 5 Mar 2023 17:19:47 +0100 Subject: [PATCH] Remove specific list of ciphers We can let the system use the full list when negotiating since we no longer support Android < 5.0 --- .../Helpers/SecurityHelpers/SslHelper.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java b/src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java index 22cab57a..47cf1d38 100644 --- a/src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java +++ b/src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java @@ -222,19 +222,7 @@ public class SslHelper { } private static void configureSslSocket(SSLSocket socket, boolean isDeviceTrusted, boolean isClient) throws SocketException { - - // These cipher suites are most common of them that are accepted by kde and android during handshake - // FIXME: Check if we can remove this and let Android chose - ArrayList supportedCiphers = new ArrayList<>(); - supportedCiphers.add("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"); // API 20+ - supportedCiphers.add("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"); // API 20+ - supportedCiphers.add("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"); // API 20+ - supportedCiphers.add("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"); // API 20+ - supportedCiphers.add("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"); // API 11+ - socket.setEnabledCipherSuites(supportedCiphers.toArray(ArrayUtils.EMPTY_STRING_ARRAY)); - - socket.setSoTimeout(10000); - + socket.setSoTimeout(10000); if (isClient) { socket.setUseClientMode(true); } else {