diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2017-01-19 00:43:45 +0100 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-01-19 11:33:04 +0100 |
commit | bf82b07ac8679b30b5f98cb2393c531d2a7d4e12 (patch) | |
tree | a4d4f208933aa90f3b0725cf12b76b6d331f876b /platform/qt/src | |
parent | dbd7186bc55e801e4541b5d3ecb9181224ea667c (diff) | |
download | qtlocation-mapboxgl-bf82b07ac8679b30b5f98cb2393c531d2a7d4e12.tar.gz |
[Qt] Use system defaults CA
The CA certificate we are bundling will expire in Aug/2018.
Diffstat (limited to 'platform/qt/src')
-rw-r--r-- | platform/qt/src/http_file_source.cpp | 21 | ||||
-rw-r--r-- | platform/qt/src/http_file_source.hpp | 2 |
2 files changed, 0 insertions, 23 deletions
diff --git a/platform/qt/src/http_file_source.cpp b/platform/qt/src/http_file_source.cpp index 9bf2cc5fac..6831c040b0 100644 --- a/platform/qt/src/http_file_source.cpp +++ b/platform/qt/src/http_file_source.cpp @@ -9,31 +9,11 @@ #include <QNetworkReply> #include <QSslConfiguration> -// Needs to be on the global namespace -// for linking purposes. -void initResources() { - Q_INIT_RESOURCE(qmapbox); -} - namespace mbgl { HTTPFileSource::Impl::Impl() : m_manager(new QNetworkAccessManager(this)) { - initResources(); - QNetworkProxyFactory::setUseSystemConfiguration(true); - -#if QT_VERSION >= 0x050000 - m_ssl.setProtocol(QSsl::SecureProtocols); -#else - // Qt 4 defines SecureProtocols as TLS1 or SSL3, but we don't want SSL3. - m_ssl.setProtocol(QSsl::TlsV1); -#endif - - m_ssl.setCaCertificates(QSslCertificate::fromPath(":ca-bundle.crt")); - if (m_ssl.caCertificates().isEmpty()) { - mbgl::Log::Warning(mbgl::Event::HttpRequest, "Could not load list of certificate authorities"); - } } void HTTPFileSource::Impl::request(HTTPRequest* req) @@ -49,7 +29,6 @@ void HTTPFileSource::Impl::request(HTTPRequest* req) } QNetworkRequest networkRequest = req->networkRequest(); - networkRequest.setSslConfiguration(m_ssl); data.first = m_manager->get(networkRequest); connect(data.first, SIGNAL(finished()), this, SLOT(onReplyFinished())); diff --git a/platform/qt/src/http_file_source.hpp b/platform/qt/src/http_file_source.hpp index 0776707069..4ba61b70da 100644 --- a/platform/qt/src/http_file_source.hpp +++ b/platform/qt/src/http_file_source.hpp @@ -8,7 +8,6 @@ #include <QObject> #include <QPair> #include <QQueue> -#include <QSslConfiguration> #include <QUrl> #include <QVector> @@ -33,7 +32,6 @@ public slots: private: QMap<QUrl, QPair<QNetworkReply *, QVector<HTTPRequest *>>> m_pending; QNetworkAccessManager *m_manager; - QSslConfiguration m_ssl; }; } // namespace mbgl |