vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Daniel Henninger 2007-12-27 16:38:25 +00:00 committed by dhenninger
parent a0021b17be
commit 0a5229f7ad
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/org/jivesoftware/smack/ConnectionConfiguration.java
View File

@ -46,7 +46,7 @@ public class ConnectionConfiguration implements Cloneable {
private String truststorePassword; private String truststorePassword;
private String keystorePath; private String keystorePath;
private String keystoreType; private String keystoreType;
private String pkcsConfig; private String pkcs11Library;
private boolean verifyChainEnabled = false; private boolean verifyChainEnabled = false;
private boolean verifyRootCAEnabled = false; private boolean verifyRootCAEnabled = false;
private boolean selfSignedCertificateEnabled = false; private boolean selfSignedCertificateEnabled = false;
@ -133,7 +133,7 @@ public class ConnectionConfiguration implements Cloneable {
truststorePassword = "changeit"; truststorePassword = "changeit";
keystorePath = System.getProperty("javax.net.ssl.keyStore"); keystorePath = System.getProperty("javax.net.ssl.keyStore");
keystoreType = "jks"; 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. * Keystore type is PKCS11.
* *
* @return the path to the PKCS11 configuration file * @return the path to the PKCS11 library file
*/ */
public String getPKCSConfig() { public String getPKCS11Library() {
return pkcsConfig; return pkcs11Library;
} }
/** /**
* Sets the PKCS11 configuration file location, needed when the * Sets the PKCS11 library file location, needed when the
* Keystore type is PKCS11 * 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) { public void setPKCS11Library(String pkcs11Library) {
this.pkcsConfig = pkcsConfig; this.pkcs11Library = pkcs11Library;
} }
/** /**

2
source/org/jivesoftware/smack/XMPPConnection.java
View File

@ -1317,7 +1317,7 @@ public class XMPPConnection {
else if(configuration.getKeystoreType().equals("PKCS11")) { else if(configuration.getKeystoreType().equals("PKCS11")) {
try { try {
Constructor c = Class.forName("sun.security.pkcs11.SunPKCS11").getConstructor(InputStream.class); 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()); ByteArrayInputStream config = new ByteArrayInputStream(pkcs11Config.getBytes());
Provider p = (Provider)c.newInstance(config); Provider p = (Provider)c.newInstance(config);
Security.addProvider(p); Security.addProvider(p);