From 2de7d4a200115965002599b62dba97d990d01e4e Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Mon, 7 Mar 2011 16:42:29 +0000
Subject: [PATCH] Reverted HTTPCLIENT-1051

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1078847 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/http/conn/ssl/AbstractVerifier.java  | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java b/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
index 350a5dd6a..547204a4e 100644
--- a/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
+++ b/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
@@ -33,9 +33,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateParsingException;
 import java.security.cert.X509Certificate;
@@ -197,20 +194,6 @@ public final void verify(final String host, final String[] cns,
                 buf.append(" OR");
             }
 
-            // Work-around for certificates that have an IPv4 address for a CN
-            if (InetAddressUtils.isIPv4Address(cn)) {
-                try {
-                    InetAddress[] addresses = Inet4Address.getAllByName(hostName);
-                    for (InetAddress address: addresses) {
-                        if (cn.equals(address.getHostAddress())) {
-                            match = true;
-                            break;
-                        }
-                    }
-                } catch (UnknownHostException ignore) {
-                }
-            }
-
             // The CN better have at least two dots if it wants wildcard
             // action.  It also can't be [*.co.uk] or [*.co.jp] or
             // [*.org.uk], etc...