@@ -4,25 +4,35 @@
  */
 package org.sensorhub.oshconnect.net.websocket;
 
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WebSocketListener;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.sensorhub.oshconnect.OSHNode;
 
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
 import java.net.URI;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
 
+
 /**
  * Class representing an active connection to a WebSocket.
  */
 public class WebSocketConnection implements WebSocketListener {
     private final StreamListener streamListener;
     private final String request;
-    private final WebSocketClient client = new WebSocketClient();
+    private WebSocketClient client = null; //new WebSocketClient();
     private final List<StatusListener> statusListeners = new ArrayList<>();
     private StreamStatus status = StreamStatus.DISCONNECTED;
+    private SSLContext sslContext = null;
+    private final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
 
     public WebSocketConnection(StreamListener streamListener, String request) {
         this.streamListener = streamListener;
@@ -37,6 +47,38 @@ public void connect() {
             clientUpgradeRequest.setHeader("Authorization", "Basic " + parentNode.getAuthorizationToken());
 
             try {
+
+                TrustManager[] trustAllCerts = new TrustManager[]{
+                        new X509TrustManager() {
+                            @Override
+                            public X509Certificate[] getAcceptedIssuers() {
+                                return new X509Certificate[0];
+                            }
+
+                            @Override
+                            public void checkClientTrusted(X509Certificate[] chain, String authType) {}
+
+                            @Override
+                            public void checkServerTrusted(X509Certificate[] chain, String authType) {}
+                        }
+                };
+
+                if ( null == sslContext ) {
+                    sslContext = SSLContext.getInstance("TLS");
+                    sslContext.init(null, trustAllCerts, new SecureRandom());
+                    SSLContext.setDefault(sslContext);
+
+                    HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
+                    HttpsURLConnection.setDefaultHostnameVerifier((hostname, session) -> true);
+
+                    sslContextFactory.setSslContext(sslContext);
+
+                }
+                sslContextFactory.getSslContext().getClientSessionContext().setSessionTimeout(0);
+                sslContextFactory.getSslContext().getClientSessionContext().setSessionCacheSize(0);
+
+                client = new WebSocketClient(sslContextFactory);
+
                 client.start();
                 client.connect(this, new URI(urlString), clientUpgradeRequest);
             } catch (Exception e) {