2 files changed, 10 insertions, 4 deletions
diff --git a/Swiften/Session/BOSHSessionStream.cpp b/Swiften/Session/BOSHSessionStream.cpp
index 99af71d..7fb8b31 100644
--- a/Swiften/Session/BOSHSessionStream.cpp
+++ b/Swiften/Session/BOSHSessionStream.cpp
@@ -77,18 +77,23 @@ BOSHSessionStream::~BOSHSessionStream() {
 	connectionPool = NULL;
 	xmppLayer->onStreamStart.disconnect(boost::bind(&BOSHSessionStream::handleStreamStartReceived, this, _1));
 	xmppLayer->onElement.disconnect(boost::bind(&BOSHSessionStream::handleElementReceived, this, _1));
 	xmppLayer->onError.disconnect(boost::bind(&BOSHSessionStream::handleXMPPError, this));
 	xmppLayer->onWriteData.disconnect(boost::bind(&BOSHSessionStream::handleXMPPLayerDataWritten, this, _1));
 	delete xmppLayer;
 	xmppLayer = NULL;
 }
 
+void BOSHSessionStream::open() {
+	connectionPool->setTLSCertificate(getTLSCertificate());
+	connectionPool->open();
+}
+
 void BOSHSessionStream::handlePoolXMPPDataRead(const SafeByteArray& data) {
 	xmppLayer->handleDataRead(data);
 }
 
 void BOSHSessionStream::writeElement(boost::shared_ptr<ToplevelElement> element) {
 	assert(available);
 	xmppLayer->writeElement(element);
 }
 
@@ -112,31 +117,31 @@ bool BOSHSessionStream::isOpen() {
 bool BOSHSessionStream::supportsTLSEncryption() {
 	return false;
 }
 
 void BOSHSessionStream::addTLSEncryption() {
 	assert(available);
 }
 
 bool BOSHSessionStream::isTLSEncrypted() {
-	return false;
+	return connectionPool->isTLSEncrypted();
 }
 
 Certificate::ref BOSHSessionStream::getPeerCertificate() const {
-	return Certificate::ref();
+	return connectionPool->getPeerCertificate();
 }
 
 std::vector<Certificate::ref> BOSHSessionStream::getPeerCertificateChain() const {
-	return std::vector<Certificate::ref>();
+	return connectionPool->getPeerCertificateChain();
 }
 
 boost::shared_ptr<CertificateVerificationError> BOSHSessionStream::getPeerCertificateVerificationError() const {
-	return boost::shared_ptr<CertificateVerificationError>();
+	return connectionPool->getPeerCertificateVerificationError();
 }
 
 ByteArray BOSHSessionStream::getTLSFinishMessage() const {
 	return ByteArray();
 }
 
 bool BOSHSessionStream::supportsZLibCompression() {
 	return false;
 }
diff --git a/Swiften/Session/BOSHSessionStream.h b/Swiften/Session/BOSHSessionStream.h
index 191a6f4..66e41ea 100644
--- a/Swiften/Session/BOSHSessionStream.h
+++ b/Swiften/Session/BOSHSessionStream.h
@@ -45,18 +45,19 @@ namespace Swift {
 					const std::string& to,
 					const URL& boshHTTPConnectProxyURL,
 					const SafeString& boshHTTPConnectProxyAuthID,
 					const SafeString& boshHTTPConnectProxyAuthPassword,
 					const TLSOptions& tlsOptions,
 					boost::shared_ptr<HTTPTrafficFilter> trafficFilter
 			);
 			virtual ~BOSHSessionStream();
 
+			void open();
 			virtual void close();
 			virtual bool isOpen();
 
 			virtual void writeHeader(const ProtocolHeader& header);
 			virtual void writeElement(boost::shared_ptr<ToplevelElement>);
 			virtual void writeFooter();
 			virtual void writeData(const std::string& data);
 
 			virtual bool supportsZLibCompression();