mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-11-26 05:52:06 +01:00
Fix some ordering.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9539 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
d3ee0e2f3e
commit
1b5203d24e
1 changed files with 2 additions and 2 deletions
|
@ -1305,11 +1305,11 @@ public class XMPPConnection {
|
|||
SSLContext context = SSLContext.getInstance("TLS");
|
||||
KeyStore ks;
|
||||
KeyManager[] kms = null;
|
||||
PasswordCallback pcb = null;
|
||||
|
||||
if(callbackHandler == null) {
|
||||
ks = null;
|
||||
} else {
|
||||
PasswordCallback pcb;
|
||||
System.out.println("Keystore type: "+configuration.getKeystoreType());
|
||||
if(configuration.getKeystoreType().equals("PKCS11")) {
|
||||
Provider p = new sun.security.pkcs11.SunPKCS11(configuration.getPKCSConfig());
|
||||
|
@ -1337,12 +1337,12 @@ public class XMPPConnection {
|
|||
kmf.init(ks,null);
|
||||
} else {
|
||||
kmf.init(ks,pcb.getPassword());
|
||||
pcb.clearPassword();
|
||||
}
|
||||
kms = kmf.getKeyManagers();
|
||||
} catch (NullPointerException npe) {
|
||||
kms = null;
|
||||
}
|
||||
pcb.clearPassword();
|
||||
}
|
||||
|
||||
// Verify certificate presented by the server
|
||||
|
|
Loading…
Reference in a new issue