Add patch to mend SSLProtocolSocketFactory.java. EAPI 5 bump. Fix security bug 442292.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 471 insertions, 4 deletions

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index c929fe516a73..ca5d88ac213a 100644
--- a/dev-java/commons-httpclient/ChangeLog
+++ b/dev-java/commons-httpclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-httpclient
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.64 2011/12/19 12:33:32 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.65 2015/06/13 09:02:44 monsieurp Exp $
+
+*commons-httpclient-3.1-r1 (13 Jun 2015)
+
+  13 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +commons-httpclient-3.1-r1.ebuild,
+  +files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch:
+  Add patch to mend SSLProtocolSocketFactory.java. EAPI 5 bump. Fix security bug
+  442292.
 
   19 Dec 2011; Ralph Sennhauser <sera@gentoo.org>
   commons-httpclient-2.0.2-r1.ebuild:
@@ -282,4 +290,3 @@
   22 Mar 2003; Dylan Carlson <absinthe@gentoo.org>
   commons-httpclient-2.0_alpha3.ebuild:
   Initial import.
-
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 2425ef004671..d55e0b89b1f0 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX commons-httpclient-3.0.1-gentoo.patch 2069 SHA256 78896bc33dbba5757f4130751d999356a329e3e669213fc047674dd510e1a043 SHA512 6fea9000aa5cc1cfe1e503cd0f575202fd98503dbc0badf100d1fd9b2089ac9ec8e3500ac8928e6e6e8923876aa082d25cdc40173b6c51cf0f891919bfe7fb92 WHIRLPOOL ae74189480cabdb2b54791bd3fae08336dee5225fd364666a899fef6c1955ecf736fe3e0776ac35ab21d403d8d03e46179efa42a98fc4c957610ab524b6d798c
+AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12963 SHA256 94b47f68b4ed1e6342478647e3bc449a492765122a80ac25fe6e21848185dfbc SHA512 d7d68d6ec7e322d9185b9209b2749c9f4c66297cf4aa1b9262c439ef67c92dc30ecab21379a5c456a6025316d26dedd772013b03bdef25975785ca6ade683398 WHIRLPOOL f663027b488569e6814532619e0d1be0677634d47aa2133e87f67ae2e56648a7688aa26952a7fb1b404759457ad3590a7c2cd8a36e897e36a891d2b6d2aa8560
 AUX gentoo.diff 444 SHA256 a3c96f4db1dc2230c1d7c1c77649b45115447f756df9f520d41a10e86bbd89ad SHA512 8a2f3d3a410e0df5ad4e89934129f9e1893483731ed6723cf8312500b6e10da2db2083bdb115969a405b8bac22fb3d3f0e2637bf3b2f8dbc104e369d8feb020e WHIRLPOOL bcefa1b87b9d956f5349e54690e1376f1d76a426efe27b7b2e30ef10261e2bc9851e14e1b383e9651e10a28048138c8094e5fe074b3f548ac1311e5a09bde422
 DIST commons-httpclient-2.0.2-src.tar.gz 1447937 SHA256 279ee55c339e512e6a9ecefe52170c8f65e0d532c3a71cfc7ad5c5cdf964a102 SHA512 2902a5c8e85c7c52137e54746d9c82031b02f35e5bc69d48f2fb30e07515d3de2da4189f72dbe87bc385547e8cecca064c23ff99ae584a8a8352433f60dba1bd WHIRLPOOL 5fc9aef3847a1d288ac0f60dd471b0f3ea7465bb6da29a99a8a977439b49de47adc9cc6eb7cc806d047e92b06dc21c895ebe1296b248891cc9224df198ad1fee
 DIST commons-httpclient-3.1-src.tar.gz 1882664 SHA256 f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490 WHIRLPOOL ea95a7fd7d6dbe0dd2326b12274629eba611014e0d2461dbd75500d3f18188d30962bf132c2a7fea98e51a81aaf44cbe097f27d8b3894a5626680ea893ea51e1
 EBUILD commons-httpclient-2.0.2-r1.ebuild 1477 SHA256 80cfdb9b8c1a6ee6e65e008d65ca02ea661aef50d2d6a7c9dc701c964b038c58 SHA512 2c0849b699bf262e49fd99fdf7eb012f5fecf3d42777867da5c156eca0fe0c83c2fb27dec0ac1541af8b42021ade6d11f7051fb4097d755b722967554a968f08 WHIRLPOOL ebac35d0c89c2dd60eb0ef10fcafb091f6422b9e2f16350839c0422021cf9fa653ae51ae9e350cd44544e55831a186d418cbb62e3455a9a6c86fd240620f1dcd
+EBUILD commons-httpclient-3.1-r1.ebuild 1801 SHA256 b51baf845b8c77ec8b04b5bddd214222946f2ba43658a5cb1e44ff39e4d2bbf7 SHA512 016b5599d7d0600dd23d69a4093966806981d2f3b47df39e7905168f5ac89f10c98d6bb7f552cb332cf79ddb8c9a99cd4382ec016fce4865dcc65d78bb1bb37e WHIRLPOOL 391e12a2b57e048a97f4918ba78863f5ab82e9986bf93cfb5c6e060d0a2f663190f9dfc6ce62d7cbe86a12cd30bd7f26ce95a36672e183fd2c6cad8fef98d51a
 EBUILD commons-httpclient-3.1.ebuild 1601 SHA256 80c196cae1a95e6c61a3b41351e96e0cd58a03b18e97bd19d5d05de8c0c74018 SHA512 4d457d19a0d00dee1e943f967ed0e62049c02c4f151ad752bccba16ecf701ccb49e72a07f24a9cc3037ed5176e7be0dc5ddaf37f111ab82987832bae0ec4501c WHIRLPOOL 4ed771bbd6feda3a685feaffa4f4adc7ddbd6f710b1d1fce0460c45786a787ba5a54ada4da997aea8b43fb69f39825c19048939274967db8ad82c4724b6cfe7a
-MISC ChangeLog 9593 SHA256 f14ddb4f1a8f16d3a59496859de9df9c105864f857d56e59512962da5f1a4e0d SHA512 5219b4d5e64cfcb4aac4888318981caf38e30aa94da0bb8f098a6d1b122ac218f5eb1805c02c0b4654fc74707f7612bd3f558949208376184d18fde77bed234d WHIRLPOOL 4b7b3ea9b5218336c5c5f903a1ea0757cf32b660c3ec4c8289b375184e37222327ee4a22194ead6eb5ba3c62bed4a6dc839b84024d7f0fafd8f39ab7f779e625
+MISC ChangeLog 9891 SHA256 9129ed4779ab881c752b8e2930fb09bef2fa3654e90760b8f9cb97386b9c6e5d SHA512 1907e01c29559b7c88052ecd7fa5fc9294d9c3e524fb81cbeb869427eb2e6cdf793c29b6b62ae0b1fc7c7545aecf023da0f0ae0a90603e321651f0850436d81b WHIRLPOOL 8d0f06de27a5efe9b8d104926656584892e29badbf1d20bd09a1f09a8860a2bfef902d7f7a4975290b233fbe01e2485257be6f251cda8b428443ac07ac149b7a
 MISC metadata.xml 378 SHA256 63d0f7bf558971c11343a9b4efd06755686373a3953c6ff369e4bd4faaf9adab SHA512 3394f05be1067ea259ad9ba425804a3d904e2d7d3392e17641876243146faf8888c01a14be328a1ee58f4c72dfcd956f961767f809398a2c61b8b7668d60d932 WHIRLPOOL 0fe59fdb65d47de8380c90a96baec6c924d83efa6841172702b21f70bebd8120803a368f2bee47ce544638536fe62a2368c4044e95ced12a22f2722d6c6a4b7f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVe/E0AAoJEJGRpfGTSRu4aZYIAJC7xlGkIJ0kH4vk2bHrfin6
+SnYQiT/YO+suwo7qSO4RmP+6fGfXL0hG6qmkOK1jBM7HTvh6CExhe6Cg/yamwacg
+xSOXLQhLJHYp3xzDzALj4GIIqthTDoZtN1TOoFQpl2jNirQOAXabxAXe7BKuMAUo
+qqwUpJvVtf6peM9V8F6g1jAv2WiLFPWwPRDQcOzHjVmRiJE/+4j9whe+1Ch0ipA9
+Z63eytuIkz+U48oSAqERiOGDUhaJgLFuFuxdPbsQ6WvJ7gvCArDP5KEXPcPVFpCV
+aXFne9lsONVezPyeaROKosXWQtDYgu9Yg4CYm6phWFr+8iUHrAEGji9s1dh1eVI=
+=hHAn
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
new file mode 100644
index 000000000000..9b0b6d977c16
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild,v 1.1 2015/06/13 09:02:44 monsieurp Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="The Jakarta Commons HttpClient library"
+HOMEPAGE="http://hc.apache.org/"
+SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+# doesn't work with IBM JDK, bug #176133
+RESTRICT="test"
+
+CDEPEND="dev-java/commons-logging:0
+	dev-java/commons-codec:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )
+	${CDEPEND}"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging,commons-codec"
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET="doc"
+
+java_prepare() {
+	# patch against CVE-2012-{5783,6153}. See bug 442292.
+	epatch "${FILESDIR}"/"${P}-SSLProtocolSocketFactory.java.patch"
+
+	# generated docs go into docs/api
+	rm -rf docs/apidocs
+
+	# remove javadoc task from compile task
+	sed -i -e 's/depends="compile,doc"/depends="compile"/' build.xml || die
+	sed -i -e '/link/ d' build.xml || die
+
+	mkdir lib && cd lib
+	java-pkg_filter-compiler jikes
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
+EANT_TEST_TARGET="test"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	# contains both html docs and javadoc in correct subdir
+	if use doc ; then
+		java-pkg_dojavadoc dist/docs/api
+		java-pkg_dohtml -r dist/docs/*
+	fi
+	use source && java-pkg_dosrc src/java/*
+	use examples && java-pkg_doexamples src/examples
+}
diff --git a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch
new file mode 100644
index 000000000000..0b5eb084c6a9
--- /dev/null
+++ b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch
@@ -0,0 +1,380 @@
+--- src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
++++ src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
+@@ -1,7 +1,7 @@
+ /*
+- * $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch,v 1.1 2015/06/13 09:02:44 monsieurp Exp $
+- * $Revision: 1.1 $
+- * $Date: 2015/06/13 09:02:44 $
++ * $HeadURL: file:///opt/j2ee/domains/atlassian.com/fisheye6/repos/asf/httpcomponents/oac.hc3x/trunk/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java $
++ * $Revision: 1.1 $
++ * $Date: 2015/06/13 09:02:44 $
+  *
+  * ====================================================================
+  *
+@@ -31,10 +31,25 @@
+ package org.apache.commons.httpclient.protocol;
+ 
+ import java.io.IOException;
++import java.io.InputStream;
+ import java.net.InetAddress;
+ import java.net.Socket;
+ import java.net.UnknownHostException;
+-
++import java.security.cert.Certificate;
++import java.security.cert.CertificateParsingException;
++import java.security.cert.X509Certificate;
++import java.util.Arrays;
++import java.util.Collection;
++import java.util.Iterator;
++import java.util.LinkedList;
++import java.util.List;
++import java.util.Locale;
++import java.util.StringTokenizer;
++import java.util.regex.Pattern;
++
++import javax.net.ssl.SSLException;
++import javax.net.ssl.SSLSession;
++import javax.net.ssl.SSLSocket;
+ import javax.net.ssl.SSLSocketFactory;
+ 
+ import org.apache.commons.httpclient.ConnectTimeoutException;
+@@ -55,6 +70,11 @@
+      */
+     private static final SSLProtocolSocketFactory factory = new SSLProtocolSocketFactory();
+     
++    // This is a a sorted list, if you insert new elements do it orderdered.
++    private final static String[] BAD_COUNTRY_2LDS =
++        {"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info",
++            "lg", "ne", "net", "or", "org"};
++    
+     /**
+      * Gets an singleton instance of the SSLProtocolSocketFactory.
+      * @return a SSLProtocolSocketFactory
+@@ -79,12 +99,14 @@
+         InetAddress clientHost,
+         int clientPort)
+         throws IOException, UnknownHostException {
+-        return SSLSocketFactory.getDefault().createSocket(
++        Socket sslSocket =  SSLSocketFactory.getDefault().createSocket(
+             host,
+             port,
+             clientHost,
+             clientPort
+         );
++        verifyHostName(host, (SSLSocket) sslSocket);
++        return sslSocket;
+     }
+ 
+     /**
+@@ -124,16 +146,19 @@
+         }
+         int timeout = params.getConnectionTimeout();
+         if (timeout == 0) {
+-            return createSocket(host, port, localAddress, localPort);
++            Socket sslSocket =  createSocket(host, port, localAddress, localPort);
++            verifyHostName(host, (SSLSocket) sslSocket);
++            return sslSocket;
+         } else {
+             // To be eventually deprecated when migrated to Java 1.4 or above
+-            Socket socket = ReflectionSocketFactory.createSocket(
++            Socket sslSocket = ReflectionSocketFactory.createSocket(
+                 "javax.net.ssl.SSLSocketFactory", host, port, localAddress, localPort, timeout);
+-            if (socket == null) {
+-                socket = ControllerThreadSocketFactory.createSocket(
++            if (sslSocket == null) {
++            	sslSocket = ControllerThreadSocketFactory.createSocket(
+                     this, host, port, localAddress, localPort, timeout);
+             }
+-            return socket;
++            verifyHostName(host, (SSLSocket) sslSocket);
++            return sslSocket;
+         }
+     }
+ 
+@@ -142,10 +167,12 @@
+      */
+     public Socket createSocket(String host, int port)
+         throws IOException, UnknownHostException {
+-        return SSLSocketFactory.getDefault().createSocket(
++        Socket sslSocket = SSLSocketFactory.getDefault().createSocket(
+             host,
+             port
+         );
++        verifyHostName(host, (SSLSocket) sslSocket);
++        return sslSocket;
+     }
+ 
+     /**
+@@ -157,13 +184,271 @@
+         int port,
+         boolean autoClose)
+         throws IOException, UnknownHostException {
+-        return ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(
++        Socket sslSocket = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(
+             socket,
+             host,
+             port,
+             autoClose
+         );
++        verifyHostName(host, (SSLSocket) sslSocket);
++        return sslSocket;
++    }
++    
++
++    
++    
++    /**
++     * Verifies that the given hostname in certicifate is the hostname we are trying to connect to
++     * http://www.cvedetails.com/cve/CVE-2012-5783/
++     * @param host
++     * @param ssl
++     * @throws IOException
++     */
++    
++	private static void verifyHostName(String host, SSLSocket ssl)
++			throws IOException {
++		if (host == null) {
++			throw new IllegalArgumentException("host to verify was null");
++		}
++
++		SSLSession session = ssl.getSession();
++		if (session == null) {
++            // In our experience this only happens under IBM 1.4.x when
++            // spurious (unrelated) certificates show up in the server's chain.
++            // Hopefully this will unearth the real problem:
++			InputStream in = ssl.getInputStream();
++			in.available();
++            /*
++                 If you're looking at the 2 lines of code above because you're
++                 running into a problem, you probably have two options:
++
++                    #1.  Clean up the certificate chain that your server
++                         is presenting (e.g. edit "/etc/apache2/server.crt" or
++                         wherever it is your server's certificate chain is
++                         defined).
++
++                                             OR
++
++                    #2.   Upgrade to an IBM 1.5.x or greater JVM, or switch to a
++                          non-IBM JVM.
++              */
++
++            // If ssl.getInputStream().available() didn't cause an exception,
++            // maybe at least now the session is available?
++			session = ssl.getSession();
++			if (session == null) {
++                // If it's still null, probably a startHandshake() will
++                // unearth the real problem.
++				ssl.startHandshake();
++
++                // Okay, if we still haven't managed to cause an exception,
++                // might as well go for the NPE.  Or maybe we're okay now?
++				session = ssl.getSession();
++			}
++		}
++
++		Certificate[] certs = session.getPeerCertificates();
++		verifyHostName(host.trim().toLowerCase(Locale.US),  (X509Certificate) certs[0]);
++	}
++	/**
++	 * Extract the names from the certificate and tests host matches one of them
++	 * @param host
++	 * @param cert
++	 * @throws SSLException
++	 */
++
++	private static void verifyHostName(final String host, X509Certificate cert)
++			throws SSLException {
++        // I'm okay with being case-insensitive when comparing the host we used
++        // to establish the socket to the hostname in the certificate.
++        // Don't trim the CN, though.
++        
++		String cn = getCN(cert);
++		String[] subjectAlts = getDNSSubjectAlts(cert);
++		verifyHostName(host, cn.toLowerCase(Locale.US), subjectAlts);
++
++	}
++
++	/**
++	 * Extract all alternative names from a certificate.
++	 * @param cert
++	 * @return
++	 */
++	private static String[] getDNSSubjectAlts(X509Certificate cert) {
++		LinkedList subjectAltList = new LinkedList();
++		Collection c = null;
++		try {
++			c = cert.getSubjectAlternativeNames();
++		} catch (CertificateParsingException cpe) {
++			// Should probably log.debug() this?
++			cpe.printStackTrace();
++		}
++		if (c != null) {
++			Iterator it = c.iterator();
++			while (it.hasNext()) {
++				List list = (List) it.next();
++				int type = ((Integer) list.get(0)).intValue();
++				// If type is 2, then we've got a dNSName
++				if (type == 2) {
++					String s = (String) list.get(1);
++					subjectAltList.add(s);
++				}
++			}
++		}
++		if (!subjectAltList.isEmpty()) {
++			String[] subjectAlts = new String[subjectAltList.size()];
++			subjectAltList.toArray(subjectAlts);
++			return subjectAlts;
++		} else {
++			return new String[0];
++		}
++	        
++	}
++	/**
++	 * Verifies
++	 * @param host
++	 * @param cn
++	 * @param subjectAlts
++	 * @throws SSLException
++	 */
++
++	private static void verifyHostName(final String host, String cn, String[] subjectAlts)throws SSLException{
++		StringBuffer cnTested = new StringBuffer();
++
++		for (int i = 0; i < subjectAlts.length; i++){
++			String name = subjectAlts[i];
++			if (name != null) {
++				name = name.toLowerCase();
++				if (verifyHostName(host, name)){
++					return;
++				}
++				cnTested.append("/").append(name);
++			}				
++		}
++		if (cn != null && verifyHostName(host, cn)){
++			return;
++		}
++		cnTested.append("/").append(cn);
++		throw new SSLException("hostname in certificate didn't match: <"
++					+ host + "> != <" + cnTested + ">");
++		
++	}		
++	
++	private static boolean verifyHostName(final String host, final String cn){
++		if (doWildCard(cn) && !isIPAddress(host)) {
++			return matchesWildCard(cn, host);
++		} 
++		return host.equalsIgnoreCase(cn);		
++	}
++    private static boolean doWildCard(String cn) {
++		// Contains a wildcard
++		// wildcard in the first block
++    	// not an ipaddress (ip addres must explicitily be equal)
++    	// not using 2nd level common tld : ex: not for *.co.uk
++    	String parts[] = cn.split("\\.");
++    	return parts.length >= 3 &&
++    			parts[0].endsWith("*") &&
++    			acceptableCountryWildcard(cn) &&
++    			!isIPAddress(cn);
+     }
++    
++    
++	private static final Pattern IPV4_PATTERN = 
++			Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$");
++
++	private static final Pattern IPV6_STD_PATTERN = 
++			Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$");
++
++	private static final Pattern IPV6_HEX_COMPRESSED_PATTERN = 
++			Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$");
++
++
++	private static boolean isIPAddress(final String hostname) {
++		return hostname != null
++				&& (
++						IPV4_PATTERN.matcher(hostname).matches()
++						|| IPV6_STD_PATTERN.matcher(hostname).matches() 
++						|| IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches()
++		);
++
++	}
++
++	private static boolean acceptableCountryWildcard(final String cn) {
++		// The CN better have at least two dots if it wants wildcard action,
++		// but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc...
++		// The [*.co.uk] problem is an interesting one. Should we just
++		// hope that CA's would never foolishly allow such a
++		// certificate to happen?
++    	
++		String[] parts = cn.split("\\.");
++		// Only checks for 3 levels, with country code of 2 letters.
++		if (parts.length > 3 || parts[parts.length - 1].length() != 2) {
++			return true;
++		}
++		String countryCode = parts[parts.length - 2];
++		return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0;
++	}
++
++	private static boolean matchesWildCard(final String cn,
++			final String hostName) {
++		String parts[] = cn.split("\\.");
++		boolean match = false;
++		String firstpart = parts[0];
++		if (firstpart.length() > 1) {
++			// server∗
++			// e.g. server
++			String prefix =  firstpart.substring(0, firstpart.length() - 1);
++			// skipwildcard part from cn
++			String suffix = cn.substring(firstpart.length()); 
++			// skip wildcard part from host
++			String hostSuffix = hostName.substring(prefix.length());			
++			match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix);
++		} else {
++			match = hostName.endsWith(cn.substring(1));
++		}
++		if (match) {
++			// I f we're in strict mode ,
++			// [ ∗.foo.com] is not allowed to match [a.b.foo.com]
++			match = countDots(hostName) == countDots(cn);
++		}
++		return match;
++	}
++
++	private static int countDots(final String data) {
++		int dots = 0;
++		for (int i = 0; i < data.length(); i++) {
++			if (data.charAt(i) == '.') {
++				dots += 1;
++			}
++		}
++		return dots;
++	}
++
++	private static String getCN(X509Certificate cert) {
++        // Note:  toString() seems to do a better job than getName()
++        //
++        // For example, getName() gives me this:
++        // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d
++        //
++        // whereas toString() gives me this:
++        // EMAILADDRESS=juliusdavies@cucbc.com        
++		String subjectPrincipal = cert.getSubjectX500Principal().toString();
++		
++		return getCN(subjectPrincipal);
++
++	}
++	private static String getCN(String subjectPrincipal) {
++		StringTokenizer st = new StringTokenizer(subjectPrincipal, ",");
++		while(st.hasMoreTokens()) {
++			String tok = st.nextToken().trim();
++			if (tok.length() > 3) {
++				if (tok.substring(0, 3).equalsIgnoreCase("CN=")) {
++					return tok.substring(3);
++				}
++			}
++		}
++		return null;
++	}
+ 
+     /**
+      * All instances of SSLProtocolSocketFactory are the same.