Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 97E8711739 for ; Mon, 18 Aug 2014 09:26:43 +0000 (UTC) Received: (qmail 94564 invoked by uid 500); 18 Aug 2014 09:26:43 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 94519 invoked by uid 500); 18 Aug 2014 09:26:43 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 94508 invoked by uid 99); 18 Aug 2014 09:26:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Aug 2014 09:26:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Aug 2014 09:26:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CD76323888D2 for ; Mon, 18 Aug 2014 09:26:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1618566 - /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractCommonHostnameVerifier.java Date: Mon, 18 Aug 2014 09:26:19 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140818092619.CD76323888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Mon Aug 18 09:26:19 2014 New Revision: 1618566 URL: http://svn.apache.org/r1618566 Log: Use RFC2253 encoded cert subject Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractCommonHostnameVerifier.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractCommonHostnameVerifier.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractCommonHostnameVerifier.java?rev=1618566&r1=1618565&r2=1618566&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractCommonHostnameVerifier.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractCommonHostnameVerifier.java Mon Aug 18 09:26:19 2014 @@ -50,6 +50,7 @@ import javax.naming.ldap.Rdn; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLException; import javax.net.ssl.SSLSession; +import javax.security.auth.x500.X500Principal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -106,8 +107,8 @@ public abstract class AbstractCommonHost public final void verify( final String host, final X509Certificate cert) throws SSLException { - final String subjectPrincipal = cert.getSubjectX500Principal().toString(); - final String[] cns = extractCNs(subjectPrincipal); + final X500Principal subjectPrincipal = cert.getSubjectX500Principal(); + final String[] cns = extractCNs(subjectPrincipal.getName(X500Principal.RFC2253)); final String[] subjectAlts = extractSubjectAlts(cert, host); verify(host, cns, subjectAlts); }