diff options
| author | Pete Bentley <prb@google.com> | 2020-12-09 17:06:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-09 17:06:14 +0000 |
| commit | cad6f31431c6b6698db4f4e2a0da9fcfef67536a (patch) | |
| tree | 45b17cc920472942bcd43ad88a466032027305e5 | |
| parent | 58b0088864693aee23a43077bfd8fd2d125fa5c5 (diff) | |
| parent | 650e71cc3acbc3f5af2ae312bc5ed71bb2d7c20b (diff) | |
Reject non-ASCII hostnames and SANs. am: 650e71cc3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/13163680
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29e2d32e3af23cace582fa80610f5ef188c28fd8
| -rw-r--r-- | harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 e6978385e0..96384adba2 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 @@ public class HostnameVerifierTest extends TestCase implements 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 @@ public class HostnameVerifierTest extends TestCase implements 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)); } |