commit 0885520573d05fc656043713326879abf072b803
author Alex Klyubin <klyubin@google.com> Wed Nov 19 20:37:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 19 20:37:03 2014 +0000
tree e7b9c3cd8dc1030473a878bb7f4dadac970a96cc
parent 2164d895f9ae077ce2d53ccdcc213c3483f3b9bd
parent 77a7e48ac80c5bb9ac4d9b6bfdecf31d46b09fd1

am 77a7e48a: Fix a bug in DefaultHostnameVerifier wildcard handling.

* commit '77a7e48ac80c5bb9ac4d9b6bfdecf31d46b09fd1':
  Fix a bug in DefaultHostnameVerifier wildcard handling.

luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java

diff --git a/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java b/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
index fa11371..fd84c3e 100644
--- a/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
+++ b/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
@@ -137,7 +137,7 @@
             return hostName.equals(cn);
         }
 
-        if (cn.startsWith("*.") && hostName.regionMatches(0, cn, 2, cn.length() - 2)) {
+        if (cn.startsWith("*.") && hostName.equals(cn.substring(2))) {
             return true; // "*.foo.com" matches "foo.com"
         }
 

luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java

diff --git a/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java b/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java
index e1c9fe3..feecebe 100644
--- a/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java
+++ b/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java
@@ -114,15 +114,18 @@
     public void testWildcardMatchesWildcardSuffix() {
         assertTrue(verifier.verifyHostName("b.c.d", "*.b.c.d"));
         assertTrue(verifier.verifyHostName("imap.google.com", "*.imap.google.com"));
+        assertFalse(verifier.verifyHostName("imap.google.com.au", "*.imap.google.com"));
     }
 
     public void testWildcardMatchingSubstring() {
         assertTrue(verifier.verifyHostName("b.c.d", "b*.c.d"));
         assertTrue(verifier.verifyHostName("imap.google.com", "ima*.google.com"));
+        assertFalse(verifier.verifyHostName("imap.google.com.au", "ima*.google.com"));
     }
 
     public void testWildcardMatchingEmptySubstring() {
         assertTrue(verifier.verifyHostName("imap.google.com", "imap*.google.com"));
+        assertFalse(verifier.verifyHostName("imap.google.com.au", "imap*.google.com"));
     }
 
     public void testWildcardMatchesChildDomain() {