2 files changed, 9 insertions, 14 deletions
diff --git a/Swiften/TLS/SecureTransport/SecureTransportCertificate.mm b/Swiften/TLS/SecureTransport/SecureTransportCertificate.mm
index 4270a6f..ed409bd 100644
--- a/Swiften/TLS/SecureTransport/SecureTransportCertificate.mm
+++ b/Swiften/TLS/SecureTransport/SecureTransportCertificate.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -36,9 +36,9 @@ SecureTransportCertificate::SecureTransportCertificate(SecCertificateRef certifi
 
 
 SecureTransportCertificate::SecureTransportCertificate(const ByteArray& der) {
-	CFDataRef derData = CFDataCreateWithBytesNoCopy(NULL, der.data(), static_cast<CFIndex>(der.size()), NULL); 
+	CFDataRef derData = CFDataCreateWithBytesNoCopy(NULL, der.data(), static_cast<CFIndex>(der.size()), NULL);
+	// certificate will take ownership of derData and free it on its release.
 	SecCertificateRef certificate = SecCertificateCreateWithData(NULL, derData);
-	CFRelease(derData);
 	if (certificate) {
 		certificateHandle_ = boost::shared_ptr<SecCertificate>(certificate, CFRelease);
 		parse();
diff --git a/Swiften/TLS/SecureTransport/SecureTransportContext.mm b/Swiften/TLS/SecureTransport/SecureTransportContext.mm
index 2357579..ca6c5bb 100644
--- a/Swiften/TLS/SecureTransport/SecureTransportContext.mm
+++ b/Swiften/TLS/SecureTransport/SecureTransportContext.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -270,16 +270,11 @@ void SecureTransportContext::verifyServerCertificate() {
 			break;
 	}
 	
-	if (verificationError_) {
-		setState(Error);
-		SSLClose(sslContext_.get());
-		sslContext_.reset();
-		onError(boost::make_shared<TLSError>());
-	}
-	else {
-		// proceed with handshake
-		processHandshake();
-	}
+	// We proceed with the TLS handshake here to give the application an opportunity
+	// to apply custom validation and trust management. The application is responsible
+	// to call \ref getPeerCertificateVerificationError directly after the \ref onConnected
+	// signal is called and before any application data is send to the context.
+	processHandshake();
 }
 
 #pragma clang diagnostic pop