Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f671938 authored by Joe Steele's avatar Joe Steele
Browse files

Re-enable TLSv1.1/1.2 support 

Was disabled in 3fd7470d.

Issue 6238.

Related Android change for API 20:
https://android.googlesource.com/platform/external/conscrypt/+/1f63d2c22326b989105366d2907a83b848dcd29e%5E!/
parent a10b9ae4

src/com/fsck/k9/net/ssl/TrustedSocketFactory.java

+10 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class TrustedSocketFactory { 


    static {

        String[] enabledCiphers = null;

        String[] enabledProtocols = null;

        String[] supportedProtocols = null;



        try {

            SSLContext sslContext = SSLContext.getInstance("TLS");
@@ -82,7 +82,13 @@ public class TrustedSocketFactory { 
            SSLSocketFactory sf = sslContext.getSocketFactory();

            SSLSocket sock = (SSLSocket) sf.createSocket();

            enabledCiphers = sock.getEnabledCipherSuites();

            enabledProtocols = sock.getEnabledProtocols();



            /*

             * Retrieve all supported protocols, not just the (default) enabled

             * ones. TLSv1.1 & TLSv1.2 are supported on API levels 16+, but are

             * only enabled by default on API levels 20+.

             */

            supportedProtocols = sock.getSupportedProtocols();

        } catch (Exception e) {

            Log.e(K9.LOG_TAG, "Error getting information about available SSL/TLS ciphers and " +

                    "protocols", e);
@@ -91,8 +97,8 @@ public class TrustedSocketFactory { 
        ENABLED_CIPHERS = (enabledCiphers == null) ? null :

                reorder(enabledCiphers, ORDERED_KNOWN_CIPHERS, BLACKLISTED_CIPHERS);



        ENABLED_PROTOCOLS = (enabledProtocols == null) ? null :

            reorder(enabledProtocols, ORDERED_KNOWN_PROTOCOLS, null);

        ENABLED_PROTOCOLS = (supportedProtocols == null) ? null :

            reorder(supportedProtocols, ORDERED_KNOWN_PROTOCOLS, null);

    }



    protected static String[] reorder(String[] enabled, String[] known, String[] blacklisted) {