commit cfbfaafbe27b55e95a594d2b39f0589e4377d008
author Pete Bentley <prb@google.com> Thu Dec 03 19:56:54 2020 +0000
committer Huizi Yang <yanghuiz@google.com> Wed Dec 09 15:54:24 2020 -0800
tree 1c894e6db11c64ffabe01d82be868b20ec182a5c
parent 2b72e0b8486db652721095e55f1f068b41989ce0

[DO NOT MERGE] Reject non-ASCII hostnames and SANs.

Updates test expectations to match OkHostnameVerifier behaviour changes
in the same topic.

Bug: 171980069
Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases
Change-Id: Ia5c6f7f95e827d43280292409b1a12c27756dba0
Merged-In: I7ccd2c6d4255d29112e9a6d58640316c364bf67a
(cherry picked from commit c247f14ad56a02de5b1aca0b29ab5b1d02f04b92)

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java
index e697838..96384ad 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java
@@ -78,7 +78,7 @@
         assertFalse(verifier.verify("a.foo.com", session));
         assertTrue(verifier.verify("bar.com", session));
         assertFalse(verifier.verify("a.bar.com", session));
-        // The certificate has this name in the altnames section, but Conscrypt drops
+        // The certificate has this name in the altnames section, but OkHostnameVerifier drops
         // any altnames that are improperly encoded according to RFC 5280, which requires
         // non-ASCII characters to be encoded in ASCII via Punycode.
         assertFalse(verifier.verify("\u82b1\u5b50.co.jp", session));
@@ -129,11 +129,11 @@
         assertFalse(verifier.verify("a.b.foo.com", session));
         assertFalse(verifier.verify("bar.com", session));
         assertTrue(verifier.verify("www.bar.com", session));
-        assertTrue(verifier.verify("\u82b1\u5b50.bar.com", session));
         assertFalse(verifier.verify("a.b.bar.com", session));
-        // The certificate has this name in the altnames section, but Conscrypt drops
+        // The certificate has this name in the altnames section, but OkHostnameVerifier drops
         // any altnames that are improperly encoded according to RFC 5280, which requires
         // non-ASCII characters to be encoded in ASCII via Punycode.
+        assertFalse(verifier.verify("\u82b1\u5b50.bar.com", session));
         assertFalse(verifier.verify("\u82b1\u5b50.co.jp", session));
         assertFalse(verifier.verify("a.\u82b1\u5b50.co.jp", session));
     }