diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-11-10 18:36:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-10 18:36:37 +0000 |
| commit | acac58bae79a73219f23f48d59fc2971fc81f3b1 (patch) | |
| tree | 364f5535d02f9c5e4d21c30d67f723557b9cd669 | |
| parent | 400d6125b6f9391e97dca870cf6504d893d9fe21 (diff) | |
| parent | b2967d68bf8547f0e6526aab6fc033795f81721b (diff) | |
| download | libcore-acac58bae79a73219f23f48d59fc2971fc81f3b1.zip libcore-acac58bae79a73219f23f48d59fc2971fc81f3b1.tar.gz libcore-acac58bae79a73219f23f48d59fc2971fc81f3b1.tar.bz2 | |
Merge "Remove workaround for *.clients.google.com hostname verication."
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java b/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java index bff63b5..013bf17 100644 --- a/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java +++ b/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java @@ -166,10 +166,7 @@ public final class DefaultHostnameVerifier implements HostnameVerifier { 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)) { |