[Qt] Use system defaults CA

The CA certificate we are bundling will expire in Aug/2018.
mapbox · Jan 19, 2017 · bf82b07 · bf82b07
1 parent dbd7186
commit bf82b07
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 33 deletions.
diff --git a/platform/qt/qmapbox.qrc b/platform/qt/qmapbox.qrc
diff --git a/platform/qt/qt4.cmake b/platform/qt/qt4.cmake
@@ -1,7 +1,5 @@
 find_package(Qt4 REQUIRED)
 
-QT4_ADD_RESOURCES(MBGL_QT_FILES platform/qt/qmapbox.qrc)
-
 set(MBGL_QT_LIBRARIES
     PRIVATE Qt4::QtCore
     PRIVATE Qt4::QtGui

diff --git a/platform/qt/qt5.cmake b/platform/qt/qt5.cmake
@@ -6,8 +6,6 @@ find_package(Qt5OpenGL   REQUIRED)
 find_package(Qt5Quick    REQUIRED)
 find_package(Qt5Widgets  REQUIRED)
 
-QT5_ADD_RESOURCES(MBGL_QT_FILES platform/qt/qmapbox.qrc)
-
 set(MBGL_QT_LIBRARIES
     PRIVATE Qt5::Core
     PRIVATE Qt5::Gui

diff --git a/platform/qt/resources/common.qrc b/platform/qt/resources/common.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/">
+        <file alias="icon.png">../../../common/icon.png</file>
         <file>source1.geojson</file>
         <file>source2.geojson</file>
         <file>label-arrow.svg</file>

diff --git 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
@@ -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