backport: square#6483

BKBASE-Plugin · Jan 30, 2024 · a4a853d · a4a853d
1 parent ad97bd3
commit a4a853d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/okhttp/src/main/java/okhttp3/internal/tls/OkHostnameVerifier.java b/okhttp/src/main/java/okhttp3/internal/tls/OkHostnameVerifier.java
@@ -28,6 +28,7 @@
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSession;
 
+import static okhttp3.internal.Util.canonicalizeHost;
 import static okhttp3.internal.Util.verifyAsIpAddress;
 
 /**
@@ -60,9 +61,10 @@ public boolean verify(String host, X509Certificate certificate) {
 
   /** Returns true if {@code certificate} matches {@code ipAddress}. */
   private boolean verifyIpAddress(String ipAddress, X509Certificate certificate) {
+    String canonicalIpAddress = canonicalizeHost(ipAddress);
     List<String> altNames = getSubjectAltNames(certificate, ALT_IPA_NAME);
     for (int i = 0, size = altNames.size(); i < size; i++) {
-      if (ipAddress.equalsIgnoreCase(altNames.get(i))) {
+      if (canonicalIpAddress.equals(canonicalizeHost(altNames.get(i)))) {
         return true;
       }
     }