Apache/httpcomponents-client
1
0
Fork 0
mirror of https://github.com/apache/httpcomponents-client.git synced 2025-02-18 07:55:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-952: Trust store parameter is ingored by SSLSocketFactory

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@953160 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2010-06-09 20:59:41 +00:00
parent c4c6cfc413
commit ade1571f00
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELEASE_NOTES.txt
View File

@ -1,6 +1,10 @@
Changes since 4.1 ALPHA2 Changes since 4.1 ALPHA2
------------------- -------------------
* [HTTPCLIENT-952] Trust store parameter is ingored by SSLSocketFactory
(affects version 4.1-alpha2 only)
Contributed by Oleg Kalnichevski <olegk at apache.org>
* [HTTPCLIENT-937] CacheEntry made immutable; now uses immutable HttpEntity * [HTTPCLIENT-937] CacheEntry made immutable; now uses immutable HttpEntity
to store cached content. to store cached content.
Contributed by David Mays <david_mays at comcast.com> and Contributed by David Mays <david_mays at comcast.com> and

2
httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
View File

@ -193,7 +193,7 @@ private static SSLContext createSSLContext(
KeyManager[] keymanagers = kmfactory.getKeyManagers(); KeyManager[] keymanagers = kmfactory.getKeyManagers();
TrustManagerFactory tmfactory = TrustManagerFactory.getInstance( TrustManagerFactory tmfactory = TrustManagerFactory.getInstance(
TrustManagerFactory.getDefaultAlgorithm()); TrustManagerFactory.getDefaultAlgorithm());
tmfactory.init(keystore); tmfactory.init(truststore);
TrustManager[] trustmanagers = tmfactory.getTrustManagers(); TrustManager[] trustmanagers = tmfactory.getTrustManagers();
if (trustmanagers != null && trustStrategy != null) { if (trustmanagers != null && trustStrategy != null) {
for (int i = 0; i < trustmanagers.length; i++) { for (int i = 0; i < trustmanagers.length; i++) {