commit 1701377c5f118bd1adb45654d7ec8d7866f1e446
author Alex Klyubin <klyubin@google.com> Mon Jul 28 15:34:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 25 21:16:23 2014 +0000
tree 1231b2749ef06ea6891f0707acf885eaba2a6acb
parent 7c7f22d80748dc444d5da3c5be11d7d81ef14a2b
parent fa38bbf9c7e67011207e31c3372a5a3da765dfe5

Merge "Remove workaround for *.clients.google.com." into lmp-dev

okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java

diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java b/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
index a08773f..326872a 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
@@ -179,10 +179,7 @@
     int suffixLength = cn.length() - (asterisk + 1);
     int suffixStart = hostName.length() - suffixLength;
     if (hostName.indexOf('.', asterisk) < suffixStart) {
-      // TODO: remove workaround for *.clients.google.com http://b/5426333
-      if (!hostName.endsWith(".clients.google.com")) {
-        return false; // wildcard '*' can't match a '.'
-      }
+      return false; // wildcard '*' can't match a '.'
     }
 
     if (!hostName.regionMatches(suffixStart, cn, asterisk + 1, suffixLength)) {