commit 4103043ab4c14908bd6ab55f3b34128a59002a9f
author Kenny Root <kroot@google.com> Wed Sep 21 14:29:06 2016 +0000
committer Kenny Root <kroot@google.com> Wed Sep 21 14:29:06 2016 +0000
tree 88f293df5157f7053624ff3fe2c3b38a8c4f0749
parent 67e057974fbe5ad36408bf5431635392b48ccd1b

Revert "Try to set endpoint identification algorithm if available"

This reverts commit 67e057974fbe5ad36408bf5431635392b48ccd1b.

Change-Id: I42ff61d10cd1da6a3a482aac1f8832b5b27f7bd5

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 d93d16a..f4828f2 100644
--- a/android/main/java/com/squareup/okhttp/internal/Platform.java
+++ b/android/main/java/com/squareup/okhttp/internal/Platform.java
@@ -28,7 +28,6 @@
 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;
 
@@ -87,10 +86,6 @@
     /** 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);
@@ -106,14 +101,10 @@
 
     public void configureTlsExtensions(
             SSLSocket sslSocket, String hostname, List<Protocol> protocols) {
-        // Enable SNI, session tickets, and endpoint identification algorithm.
+        // Enable SNI and session tickets.
         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.