vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-29 23:42:06 +01:00
Code Issues Releases Wiki Activity

Fix some ordering.

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9539 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Jay Kline 2007-11-30 20:02:01 +00:00 committed by jay
parent d3ee0e2f3e
commit 1b5203d24e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/org/jivesoftware/smack/XMPPConnection.java
View file

@ -1305,11 +1305,11 @@ public class XMPPConnection {
SSLContext context = SSLContext.getInstance("TLS"); SSLContext context = SSLContext.getInstance("TLS");
KeyStore ks; KeyStore ks;
KeyManager[] kms = null; KeyManager[] kms = null;
PasswordCallback pcb = null;
if(callbackHandler == null) { if(callbackHandler == null) {
ks = null; ks = null;
} else { } else {
PasswordCallback pcb;
System.out.println("Keystore type: "+configuration.getKeystoreType()); System.out.println("Keystore type: "+configuration.getKeystoreType());
if(configuration.getKeystoreType().equals("PKCS11")) { if(configuration.getKeystoreType().equals("PKCS11")) {
Provider p = new sun.security.pkcs11.SunPKCS11(configuration.getPKCSConfig()); Provider p = new sun.security.pkcs11.SunPKCS11(configuration.getPKCSConfig());
@ -1337,12 +1337,12 @@ public class XMPPConnection {
kmf.init(ks,null); kmf.init(ks,null);
} else { } else {
kmf.init(ks,pcb.getPassword()); kmf.init(ks,pcb.getPassword());
pcb.clearPassword();
} }
kms = kmf.getKeyManagers(); kms = kmf.getKeyManagers();
} catch (NullPointerException npe) { } catch (NullPointerException npe) {
kms = null; kms = null;
} }
pcb.clearPassword();
} }
// Verify certificate presented by the server // Verify certificate presented by the server