summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/QA')
-rw-r--r--Swiften/QA/TLSTest/CertificateErrorTest.cpp2
-rw-r--r--Swiften/QA/TLSTest/SConscript1
-rw-r--r--Swiften/QA/TLSTest/jabber_org.crtbin2082 -> 2081 bytes
3 files changed, 2 insertions, 1 deletions
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
--- a/Swiften/QA/TLSTest/jabber_org.crt
+++ b/Swiften/QA/TLSTest/jabber_org.crt
Binary files differ