1 files changed, 6 insertions, 4 deletions
diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp
index 274d218..43f1c48 100644
--- a/Swiften/Session/BasicSessionStream.cpp
+++ b/Swiften/Session/BasicSessionStream.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Session/BasicSessionStream.h>
 
@@ -24,20 +24,22 @@ BasicSessionStream::BasicSessionStream(
 		StreamType streamType,
 		boost::shared_ptr<Connection> connection,
 		PayloadParserFactoryCollection* payloadParserFactories,
 		PayloadSerializerCollection* payloadSerializers,
 		TLSContextFactory* tlsContextFactory,
 		TimerFactory* timerFactory,
-		XMLParserFactory* xmlParserFactory) :
+		XMLParserFactory* xmlParserFactory,
+		const TLSOptions& tlsOptions) :
 			available(false),
 			connection(connection),
 			tlsContextFactory(tlsContextFactory),
 			timerFactory(timerFactory),
 			compressionLayer(NULL),
 			tlsLayer(NULL),
-			whitespacePingLayer(NULL) {
+			whitespacePingLayer(NULL),
+			tlsOptions_(tlsOptions) {
 	xmppLayer = new XMPPLayer(payloadParserFactories, payloadSerializers, xmlParserFactory, streamType);
 	xmppLayer->onStreamStart.connect(boost::bind(&BasicSessionStream::handleStreamStartReceived, this, _1));
 	xmppLayer->onElement.connect(boost::bind(&BasicSessionStream::handleElementReceived, this, _1));
 	xmppLayer->onError.connect(boost::bind(&BasicSessionStream::handleXMPPError, this));
 	xmppLayer->onDataRead.connect(boost::bind(&BasicSessionStream::handleDataRead, this, _1));
 	xmppLayer->onWriteData.connect(boost::bind(&BasicSessionStream::handleDataWritten, this, _1));
@@ -103,13 +105,13 @@ bool BasicSessionStream::isOpen() {
 bool BasicSessionStream::supportsTLSEncryption() {
 	return tlsContextFactory && tlsContextFactory->canCreate();
 }
 
 void BasicSessionStream::addTLSEncryption() {
 	assert(available);
-	tlsLayer = new TLSLayer(tlsContextFactory);
+	tlsLayer = new TLSLayer(tlsContextFactory, tlsOptions_);
 	if (hasTLSCertificate() && !tlsLayer->setClientCertificate(getTLSCertificate())) {
 		onClosed(boost::make_shared<SessionStreamError>(SessionStreamError::InvalidTLSCertificateError));
 	}
 	else {
 		streamStack->addLayer(tlsLayer);
 		tlsLayer->onError.connect(boost::bind(&BasicSessionStream::handleTLSError, this, _1));