[dmdirc commit] r5816 - trunk/src/com/dmdirc

[com...@dmdirc.com]

Author: chris87
Date: 2010-01-22 19:39:04 +0000 (Fri, 22 Jan 2010)
New Revision: 5816

Modified:
trunk/src/com/dmdirc/CertificateManager.java
Log:
We don't need to provide a cacert password

Git-version: 0.6.3m2-343-gdc6a482

Modified: trunk/src/com/dmdirc/CertificateManager.java
===================================================================
--- trunk/src/com/dmdirc/CertificateManager.java 2010-01-22 19:38:24 UTC (rev 5815)
+++ trunk/src/com/dmdirc/CertificateManager.java 2010-01-22 19:39:04 UTC (rev 5816)
@@ -88,9 +88,6 @@
}
}

- /** The password for the global java cacert file. */
- private final String cacertpass;
-
/** The server name the user is trying to connect to. */
private final String serverName;

@@ -119,7 +116,6 @@
public CertificateManager(final String serverName, final ConfigManager config) {
this.serverName = serverName;
this.config = config;
- this.cacertpass = config.getOption("ssl", "cacertpass");
this.checkDate = config.getOptionBool("ssl", "checkdate");
this.checkIssuer = config.getOptionBool("ssl", "checkissuer");
this.checkHost = config.getOptionBool("ssl", "checkhost");
@@ -138,7 +134,7 @@
+ "/lib/security/cacerts".replace('/', File.separatorChar);
is = new FileInputStream(filename);
final KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
- keystore.load(is, cacertpass.toCharArray());
+ keystore.load(is, null);

final PKIXParameters params = new PKIXParameters(keystore);
for (TrustAnchor anchor : params.getTrustAnchors()) {