diff --git a/okhttp/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.java b/okhttp/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.java index 2a31fda29..546444df0 100644 --- a/okhttp/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.java +++ b/okhttp/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.java @@ -30,9 +30,11 @@ import javax.security.auth.x500.X500Principal; import okhttp3.FakeSSLSession; import okhttp3.OkHttpClient; import okhttp3.internal.Util; +import okhttp3.testing.PlatformRule; import okhttp3.tls.HeldCertificate; import okhttp3.tls.internal.TlsUtil; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; @@ -43,6 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ public final class HostnameVerifierTest { private OkHostnameVerifier verifier = OkHostnameVerifier.INSTANCE; + @RegisterExtension public PlatformRule platform = new PlatformRule(); @Test public void verify() { FakeSSLSession session = new FakeSSLSession(); @@ -186,7 +189,11 @@ public final class HostnameVerifierTest { + "-----END CERTIFICATE-----\n"); X509Certificate peerCertificate = ((X509Certificate) session.getPeerCertificates()[0]); - assertThat(certificateSANs(peerCertificate)).containsExactly("bar.com", "������.co.jp"); + if (platform.isConscrypt()) { + assertThat(certificateSANs(peerCertificate)).containsExactly("bar.com"); + } else { + assertThat(certificateSANs(peerCertificate)).containsExactly("bar.com", "������.co.jp"); + } assertThat(verifier.verify("foo.com", session)).isFalse(); assertThat(verifier.verify("a.foo.com", session)).isFalse(); @@ -375,7 +382,11 @@ public final class HostnameVerifierTest { + "-----END CERTIFICATE-----\n"); X509Certificate peerCertificate = ((X509Certificate) session.getPeerCertificates()[0]); - assertThat(certificateSANs(peerCertificate)).containsExactly("*.bar.com", "*.������.co.jp"); + if (platform.isConscrypt()) { + assertThat(certificateSANs(peerCertificate)).containsExactly("*.bar.com"); + } else { + assertThat(certificateSANs(peerCertificate)).containsExactly("*.bar.com", "*.������.co.jp"); + } // try the foo.com variations assertThat(verifier.verify("foo.com", session)).isFalse();