3 files changed, 6 insertions, 5 deletions
diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
index 54addef..8c03052 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
@@ -126,19 +126,19 @@ void OpenSSLContext::doConnect() {
 			//std::cout << "Compression: " << SSL_COMP_get_name(comp) << std::endl;
 			onConnected();
 			break;
 		}
 		case SSL_ERROR_WANT_READ:
 			sendPendingDataToNetwork();
 			break;
 		default:
 			state_ = Error;
-			onError();
+			onError(boost::make_shared<TLSError>());
 	}
 }
 
 void OpenSSLContext::sendPendingDataToNetwork() {
 	int size = BIO_pending(writeBIO_);
 	if (size > 0) {
 		SafeByteArray data;
 		data.resize(size);
 		BIO_read(writeBIO_, vecptr(data), size);
@@ -160,35 +160,35 @@ void OpenSSLContext::handleDataFromNetwork(const SafeByteArray& data) {
 	}
 }
 
 void OpenSSLContext::handleDataFromApplication(const SafeByteArray& data) {
 	if (SSL_write(handle_, vecptr(data), data.size()) >= 0) {
 		sendPendingDataToNetwork();
 	}
 	else {
 		state_ = Error;
-		onError();
+		onError(boost::make_shared<TLSError>());
 	}
 }
 
 void OpenSSLContext::sendPendingDataToApplication() {
 	SafeByteArray data;
 	data.resize(SSL_READ_BUFFERSIZE);
 	int ret = SSL_read(handle_, vecptr(data), data.size());
 	while (ret > 0) {
 		data.resize(ret);
 		onDataForApplication(data);
 		data.resize(SSL_READ_BUFFERSIZE);
 		ret = SSL_read(handle_, vecptr(data), data.size());
 	}
 	if (ret < 0 && SSL_get_error(handle_, ret) != SSL_ERROR_WANT_READ) {
 		state_ = Error;
-		onError();
+		onError(boost::make_shared<TLSError>());
 	}
 }
 
 bool OpenSSLContext::setClientCertificate(CertificateWithKey::ref certificate) {
 	boost::shared_ptr<PKCS12Certificate> pkcs12Certificate = boost::dynamic_pointer_cast<PKCS12Certificate>(certificate);
 	if (!pkcs12Certificate || pkcs12Certificate->isNull()) {
 		return false;
 	}
 
diff --git a/Swiften/TLS/Schannel/SchannelContext.cpp b/Swiften/TLS/Schannel/SchannelContext.cpp
index 9be1ded..4f8f36f 100644
--- a/Swiften/TLS/Schannel/SchannelContext.cpp
+++ b/Swiften/TLS/Schannel/SchannelContext.cpp
@@ -467,19 +467,19 @@ void SchannelContext::handleDataFromNetwork(const SafeByteArray& data)
 	}
 }
 
 //------------------------------------------------------------------------
 
 void SchannelContext::indicateError() 
 {
 	m_state = Error;
 	m_receivedData.clear();
-	onError();
+	onError(boost::make_shared<TLSError>());
 }
 
 //------------------------------------------------------------------------
 
 void SchannelContext::decryptAndProcessData(const SafeByteArray& data) 
 {
 	SecBuffer inBuffers[4]	= {0};
 
 	appendNewData(data);
diff --git a/Swiften/TLS/TLSContext.h b/Swiften/TLS/TLSContext.h
index 9dee902..5640fe1 100644
--- a/Swiften/TLS/TLSContext.h
+++ b/Swiften/TLS/TLSContext.h
@@ -7,18 +7,19 @@
 #pragma once
 
 #include <Swiften/Base/boost_bsignals.h>
 #include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/SafeByteArray.h>
 #include <Swiften/TLS/Certificate.h>
 #include <Swiften/TLS/CertificateWithKey.h>
 #include <Swiften/TLS/CertificateVerificationError.h>
+#include <Swiften/TLS/TLSError.h>
 
 namespace Swift {
 
 	class TLSContext {
 		public:
 			virtual ~TLSContext();
 
 			virtual void connect() = 0;
 
@@ -29,13 +30,13 @@ namespace Swift {
 
 			virtual Certificate::ref getPeerCertificate() const = 0;
 			virtual CertificateVerificationError::ref getPeerCertificateVerificationError() const = 0;
 
 			virtual ByteArray getFinishMessage() const = 0;
 
 		public:
 			boost::signal<void (const SafeByteArray&)> onDataForNetwork;
 			boost::signal<void (const SafeByteArray&)> onDataForApplication;
-			boost::signal<void ()> onError;
+			boost::signal<void (boost::shared_ptr<TLSError>)> onError;
 			boost::signal<void ()> onConnected;
 	};
 }