3 files changed, 8 insertions, 7 deletions
diff --git a/Swiften/Network/BOSHConnection.cpp b/Swiften/Network/BOSHConnection.cpp
index b4ffa7d..4bbb121 100644
--- a/Swiften/Network/BOSHConnection.cpp
+++ b/Swiften/Network/BOSHConnection.cpp
@@ -7,3 +7,3 @@
 /*
- * Copyright (c) 2011-2017 Isode Limited.
+ * Copyright (c) 2011-2018 Isode Limited.
  * All rights reserved.
@@ -29,2 +29,3 @@
 #include <Swiften/TLS/TLSContext.h>
+#include <Swiften/TLS/TLSContextFactory.h>
 #include <Swiften/TLS/TLSOptions.h>
@@ -44,3 +45,4 @@ BOSHConnection::BOSHConnection(const URL& boshURL, Connector::ref connector, XML
     if (boshURL_.getScheme() == "https") {
-        tlsLayer_ = std::make_shared<TLSLayer>(tlsContextFactory, tlsOptions);
+        auto tlsContext = tlsContextFactory->createTLSContext(tlsOptions);
+        tlsLayer_ = std::make_shared<TLSLayer>(std::move(tlsContext));
         // The following dummyLayer_ is needed as the TLSLayer will pass the decrypted data to its parent layer.
diff --git a/Swiften/Network/TLSConnection.cpp b/Swiften/Network/TLSConnection.cpp
index 7c293d1..82bf114 100644
--- a/Swiften/Network/TLSConnection.cpp
+++ b/Swiften/Network/TLSConnection.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2018 Isode Limited.
  * All rights reserved.
@@ -34,3 +34,2 @@ TLSConnection::~TLSConnection() {
     connection->onDisconnected.disconnect(boost::bind(&TLSConnection::handleRawDisconnected, this, _1));
-    delete context;
 }
@@ -73,3 +72,3 @@ HostAddressPort TLSConnection::getRemoteAddress() const {
 TLSContext* TLSConnection::getTLSContext() const {
-    return context;
+    return context.get();
 }
diff --git a/Swiften/Network/TLSConnection.h b/Swiften/Network/TLSConnection.h
index 0c395d1..1ab1ec6 100644
--- a/Swiften/Network/TLSConnection.h
+++ b/Swiften/Network/TLSConnection.h
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2018 Isode Limited.
  * All rights reserved.
@@ -48,3 +48,3 @@ namespace Swift {
         private:
-            TLSContext* context;
+            std::unique_ptr<TLSContext> context;
             Connection::ref connection;