github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-12 16:23:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Support SSL certificate bundles. Issue #4896.

Browse source
This commit is contained in:
UnDifferential 2016-03-05 02:41:18 -05:00 • committed by Brandon Rutledge
parent 15ec515872
commit f50a8d4f59
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/base/http/server.cpp
View file

@ -52,9 +52,9 @@ Server::~Server()
}
#ifndef QT_NO_OPENSSL
void Server::enableHttps(const QSslCertificate &certificate, const QSslKey &key)
void Server::enableHttps(const QList<QSslCertificate> &certificates, const QSslKey &key)
{
m_certificate = certificate;
m_certificates = certificates;
m_key = key;
m_https = true;
}
@ -62,7 +62,7 @@ void Server::enableHttps(const QSslCertificate &certificate, const QSslKey &key)
void Server::disableHttps()
{
m_https = false;
m_certificate.clear();
m_certificates.clear();
m_key.clear();
}
#endif
@ -84,9 +84,13 @@ void Server::incomingConnection(int socketDescriptor)
if (serverSocket->setSocketDescriptor(socketDescriptor)) {
#ifndef QT_NO_OPENSSL
if (m_https) {
static_cast<QSslSocket*>(serverSocket)->setProtocol(QSsl::AnyProtocol);
static_cast<QSslSocket*>(serverSocket)->setProtocol(QSsl::SecureProtocols);
static_cast<QSslSocket*>(serverSocket)->setPrivateKey(m_key);
static_cast<QSslSocket*>(serverSocket)->setLocalCertificate(m_certificate);
#ifdef QBT_USES_QT5
static_cast<QSslSocket*>(serverSocket)->setLocalCertificateChain(m_certificates);
#else
static_cast<QSslSocket*>(serverSocket)->setLocalCertificate(m_certificates.first());
#endif
static_cast<QSslSocket*>(serverSocket)->startServerEncryption();
}
#endif