From b3284f9ce20516a1b6c8703044563cdcd8272201 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 1 Mar 2016 08:08:54 +0100
Subject: Fix small issues around Swiften/QA/TLSTest

The jabber_org.crt was falsely modified in commit 0297fa1;
reverted the file to its previous version.
Fixed a syntax error in CertificateErrorTest.
Fixed compilation of TLS stack with external OpenSSL.

Test-Information:

Tested compilation ./scons test=system Swiften/QA/TLSTest
with OpenSSL on OS X 10.11.3.

Change-Id: I58caf94dded128d3ee725b1961e54ad2955d70aa

diff --git a/Swiften/QA/TLSTest/CertificateErrorTest.cpp b/Swiften/QA/TLSTest/CertificateErrorTest.cpp
index 1d87994..ec8c4e3 100644
--- a/Swiften/QA/TLSTest/CertificateErrorTest.cpp
+++ b/Swiften/QA/TLSTest/CertificateErrorTest.cpp
@@ -53,7 +53,7 @@ class CertificateErrorTest : public CppUnit::TestFixture {
 			boostIOService_ = boost::make_shared<boost::asio::io_service>();
 			connectionFactory_ = new BoostConnectionFactory(boostIOServiceThread_->getIOService(), eventLoop_);
 			idnConverter_ = PlatformIDNConverter::create();
-			domainNameResolver_ = new PlatformDomainNameResolver(idnConverter_, eventLoop_),
+			domainNameResolver_ = new PlatformDomainNameResolver(idnConverter_, eventLoop_);
 
 			tlsFactories_ = new PlatformTLSFactories();
 			tlsContextFactory_ = tlsFactories_->getTLSContextFactory();
diff --git a/Swiften/QA/TLSTest/SConscript b/Swiften/QA/TLSTest/SConscript
index 0ac50e6..1a2e2c0 100644
--- a/Swiften/QA/TLSTest/SConscript
+++ b/Swiften/QA/TLSTest/SConscript
@@ -12,6 +12,7 @@ if env["TEST"] :
 	
 	if myenv.get("HAVE_OPENSSL", 0) :
 		myenv.Append(CPPDEFINES = "HAVE_OPENSSL")
+		myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
 	elif myenv.get("HAVE_SCHANNEL", 0) :
 		myenv.Append(CPPDEFINES = "HAVE_SCHANNEL")
 	elif myenv.get("HAVE_SECURETRANSPORT", 0) :
diff --git a/Swiften/QA/TLSTest/jabber_org.crt b/Swiften/QA/TLSTest/jabber_org.crt
index f7d619f..5a9ddaa 100644
Binary files a/Swiften/QA/TLSTest/jabber_org.crt and b/Swiften/QA/TLSTest/jabber_org.crt differ
-- 
cgit v0.10.2-6-g49f6