commit 14a4a6123fa837cfb0a9cb1e76122f70184b3110
author Kenny Root <kroot@google.com> Wed Sep 21 04:48:47 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 21 04:48:47 2016 +0000
tree 07511e62e9504da8139dd4558ace3ae449557601
parent 690d6e24f8887a72de9b37b9a7ff54680492128d
parent 67e057974fbe5ad36408bf5431635392b48ccd1b

Merge "Try to set endpoint identification algorithm if available"

android/main/java/com/squareup/okhttp/internal/Platform.java

diff --git a/android/main/java/com/squareup/okhttp/internal/Platform.java b/android/main/java/com/squareup/okhttp/internal/Platform.java
index f4828f2..d93d16a 100644
--- a/android/main/java/com/squareup/okhttp/internal/Platform.java
+++ b/android/main/java/com/squareup/okhttp/internal/Platform.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
 
@@ -86,6 +87,10 @@
     /** setAlpnSelectedProtocol(byte[]) */
     private static final OptionalMethod<Socket> SET_ALPN_PROTOCOLS =
             new OptionalMethod<Socket>(null, "setAlpnProtocols", byte[].class );
+    /** setEndpointIdentificationAlgorithm(String) */
+    private static final OptionalMethod<SSLParameters> SET_ENDPOINT_IDENTIFICATION_ALGORITHM =
+            new OptionalMethod<SSLParameters>(null, "setEndpointIdentificationAlgorithm",
+                    String.class);
 
     public void logW(String warning) {
         System.logW(warning);
@@ -101,10 +106,14 @@
 
     public void configureTlsExtensions(
             SSLSocket sslSocket, String hostname, List<Protocol> protocols) {
-        // Enable SNI and session tickets.
+        // Enable SNI, session tickets, and endpoint identification algorithm.
         if (hostname != null) {
             SET_USE_SESSION_TICKETS.invokeOptionalWithoutCheckedException(sslSocket, true);
             SET_HOSTNAME.invokeOptionalWithoutCheckedException(sslSocket, hostname);
+
+            // Set endpoint hostname identification algorithm.
+            SET_ENDPOINT_IDENTIFICATION_ALGORITHM.invokeWithoutCheckedException(
+                    sslSocket.getSSLParameters(), "HTTPS");
         }
 
         // Enable ALPN.