From 0a5229f7add9853654feba7416ffd7c99cb43263 Mon Sep 17 00:00:00 2001 From: Daniel Henninger Date: Thu, 27 Dec 2007 16:38:25 +0000 Subject: [PATCH] Changing PKCS to PKCS11 and config to library for proper terminology. git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9692 b35dd754-fafc-0310-a699-88a17e54d16e --- .../smack/ConnectionConfiguration.java | 20 +++++++++---------- .../jivesoftware/smack/XMPPConnection.java | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/org/jivesoftware/smack/ConnectionConfiguration.java b/source/org/jivesoftware/smack/ConnectionConfiguration.java index 8a8f3891d..b8e23f319 100644 --- a/source/org/jivesoftware/smack/ConnectionConfiguration.java +++ b/source/org/jivesoftware/smack/ConnectionConfiguration.java @@ -46,7 +46,7 @@ public class ConnectionConfiguration implements Cloneable { private String truststorePassword; private String keystorePath; private String keystoreType; - private String pkcsConfig; + private String pkcs11Library; private boolean verifyChainEnabled = false; private boolean verifyRootCAEnabled = false; private boolean selfSignedCertificateEnabled = false; @@ -133,7 +133,7 @@ public class ConnectionConfiguration implements Cloneable { truststorePassword = "changeit"; keystorePath = System.getProperty("javax.net.ssl.keyStore"); keystoreType = "jks"; - pkcsConfig = "pkcs11.config"; + pkcs11Library = "pkcs11.config"; } /** @@ -288,23 +288,23 @@ public class ConnectionConfiguration implements Cloneable { /** - * Returns the PKCS11 configuration file location, needed when the + * Returns the PKCS11 library file location, needed when the * Keystore type is PKCS11. * - * @return the path to the PKCS11 configuration file + * @return the path to the PKCS11 library file */ - public String getPKCSConfig() { - return pkcsConfig; + public String getPKCS11Library() { + return pkcs11Library; } /** - * Sets the PKCS11 configuration file location, needed when the + * Sets the PKCS11 library file location, needed when the * Keystore type is PKCS11 * - * @param pkcsConfig the path to the PKCS11 configuration file + * @param pkcs11Library the path to the PKCS11 library file */ - public void setPKCSConfig(String pkcsConfig) { - this.pkcsConfig = pkcsConfig; + public void setPKCS11Library(String pkcs11Library) { + this.pkcs11Library = pkcs11Library; } /** diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java index d6d1e0f39..d59a910bc 100644 --- a/source/org/jivesoftware/smack/XMPPConnection.java +++ b/source/org/jivesoftware/smack/XMPPConnection.java @@ -1317,7 +1317,7 @@ public class XMPPConnection { else if(configuration.getKeystoreType().equals("PKCS11")) { try { Constructor c = Class.forName("sun.security.pkcs11.SunPKCS11").getConstructor(InputStream.class); - String pkcs11Config = "name = SmartCard\nlibrary = "+configuration.getPKCSConfig(); + String pkcs11Config = "name = SmartCard\nlibrary = "+configuration.getPKCS11Library(); ByteArrayInputStream config = new ByteArrayInputStream(pkcs11Config.getBytes()); Provider p = (Provider)c.newInstance(config); Security.addProvider(p);