stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix compilation

Browse source
This commit is contained in:
Vitaly Takmazov 2012-08-15 17:10:53 +04:00
parent c7d4d70117
commit 8c77ffefc2
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/Swiften/Server/ServerStanzaChannel.cpp
View file

@ -173,9 +173,4 @@ void ServerStanzaChannel::handleSessionInitialized() {
onAvailableChanged(true);
}
std::vector<Certificate::ref> ServerStanzaChannel::getPeerCertificateChain() const {
return std::vector<Certificate::ref>();
}
}

1
include/Swiften/Server/ServerStanzaChannel.h
View file

@ -32,7 +32,6 @@ namespace Swift {
bool getStreamManagementEnabled() const {
return false;
}
virtual std::vector<Certificate::ref> getPeerCertificateChain() const;
bool isAvailable() const {
return true;

6
src/transport.cpp
View file

@ -82,12 +82,10 @@ Component::Component(Swift::EventLoop *loop, Swift::NetworkFactories *factories,
LOG4CXX_INFO(logger, "Creating component in server mode on port " << CONFIG_INT(m_config, "service.port"));
m_server = new Swift::Server(loop, m_factories, m_userRegistry, m_jid, CONFIG_INT(m_config, "service.port"));
if (!CONFIG_STRING(m_config, "service.cert").empty()) {
#ifndef _WIN32
//TODO: fix
LOG4CXX_INFO(logger, "Using PKCS#12 certificate " << CONFIG_STRING(m_config, "service.cert"));
LOG4CXX_INFO(logger, "SSLv23_server_method used.");
#ifdef _MSC_VER
TLSServerContextFactory *f = new SchannelServerContextFactory();
m_server->addTLSEncryption(f, boost::make_shared<CAPICertificate>(CONFIG_STRING(m_config, "service.cert")));
#else
TLSServerContextFactory *f = new OpenSSLServerContextFactory();
m_server->addTLSEncryption(f, boost::make_shared<PKCS12Certificate>(CONFIG_STRING(m_config, "service.cert"), createSafeByteArray(CONFIG_STRING(m_config, "service.cert_password"))));
#endif