From 7e8e8f8d709318cce97f40adaee8a4abbdc2b960 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 8 Nov 2016 15:14:28 +0300
Subject: xmpp: allow s2s without tls

---
 juick-ws/src/main/java/com/juick/ws/s2s/Connection.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'juick-ws/src/main/java/com/juick/ws/s2s/Connection.java')

diff --git a/juick-ws/src/main/java/com/juick/ws/s2s/Connection.java b/juick-ws/src/main/java/com/juick/ws/s2s/Connection.java
index 77c12d1d..b187aa3e 100644
--- a/juick-ws/src/main/java/com/juick/ws/s2s/Connection.java
+++ b/juick-ws/src/main/java/com/juick/ws/s2s/Connection.java
@@ -61,15 +61,14 @@ public class Connection {
         KeyStore ks = KeyStore.getInstance("JKS");
         try (InputStream ksIs = new FileInputStream(xmpp.keystore)) {
             ks.load(ksIs, xmpp.keystorePassword.toCharArray());
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory
+                    .getDefaultAlgorithm());
+            kmf.init(ks, xmpp.keystorePassword.toCharArray());
+            sc = SSLContext.getInstance("TLSv1.2");
+            sc.init(kmf.getKeyManagers(), trustAllCerts, new SecureRandom());
+        } catch (Exception e) {
+            logger.warning("tls unavailable");
         }
-
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory
-                .getDefaultAlgorithm());
-        kmf.init(ks, xmpp.keystorePassword.toCharArray());
-        sc = SSLContext.getInstance("TLSv1.2");
-
-        sc.init(kmf.getKeyManagers(), trustAllCerts, new SecureRandom());
-
     }
 
     public void logParser() {
-- 
cgit v1.2.3