From 573358b459bc6402a6eca6f3daf075df3c3f0bf3 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 23 Nov 2017 08:15:52 +0100 Subject: [PATCH] Limit the scope of local variables in proceedTLSReceived() --- .../org/jivesoftware/smack/tcp/XMPPTCPConnection.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java index 5b316907f..61fe6cf58 100644 --- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java +++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java @@ -684,10 +684,6 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { * @throws Exception if an exception occurs. */ private void proceedTLSReceived() throws NoSuchAlgorithmException, CertificateException, IOException, KeyStoreException, NoSuchProviderException, UnrecoverableKeyException, KeyManagementException, SmackException { - SSLContext context = this.config.getCustomSSLContext(); - KeyStore ks = null; - KeyManager[] kms = null; - PasswordCallback pcb = null; SmackDaneVerifier daneVerifier = null; if (config.getDnssecMode() == DnssecMode.needsDnssecAndDane) { @@ -701,6 +697,10 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { } } + SSLContext context = this.config.getCustomSSLContext(); + KeyStore ks = null; + PasswordCallback pcb = null; + if (context == null) { final String keyStoreType = config.getKeystoreType(); final CallbackHandler callbackHandler = config.getCallbackHandler(); @@ -745,6 +745,8 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { } } + KeyManager[] kms = null; + if (ks != null) { String keyManagerFactoryAlgorithm = KeyManagerFactory.getDefaultAlgorithm(); KeyManagerFactory kmf = KeyManagerFactory.getInstance(keyManagerFactoryAlgorithm);