[jsslutils commit] r61 - in trunk/jsslutils: . src/main/java/org/jsslutils/sslcontext

[codesite...@google.com]

Author: Bruno.H...@manchester.ac.uk
Date: Mon Oct 6 17:35:17 2008
New Revision: 61

Modified:
trunk/jsslutils/pom.xml

trunk/jsslutils/src/main/java/org/jsslutils/sslcontext/PKIXSSLContextFactory.java

Log:
PKIX factory uses default trust material when none provided.

Modified: trunk/jsslutils/pom.xml
==============================================================================
--- trunk/jsslutils/pom.xml (original)
+++ trunk/jsslutils/pom.xml Mon Oct 6 17:35:17 2008
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jsslutils</groupId>
<artifactId>jsslutils</artifactId>
- <version>0.5</version>
+ <version>0.5.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>jSSLutils</name>
<url>http://www.jsslutils.org/</url>

Modified:
trunk/jsslutils/src/main/java/org/jsslutils/sslcontext/PKIXSSLContextFactory.java
==============================================================================
---
trunk/jsslutils/src/main/java/org/jsslutils/sslcontext/PKIXSSLContextFactory.java
(original)
+++
trunk/jsslutils/src/main/java/org/jsslutils/sslcontext/PKIXSSLContextFactory.java
Mon Oct 6 17:35:17 2008
@@ -164,13 +164,15 @@
ManagerFactoryParameters trustParams = getTrustParams();
if (trustParams != null) {
tmf.init(trustParams);
- return tmf.getTrustManagers();
} else {
- return null;
+ tmf.init((KeyStore)null);
}
+ return tmf.getTrustManagers();
} catch (NoSuchAlgorithmException e) {
throw new SSLContextFactoryException(e);
} catch (InvalidAlgorithmParameterException e) {
+ throw new SSLContextFactoryException(e);
+ } catch (KeyStoreException e) {
throw new SSLContextFactoryException(e);
}
}