From bf82b07ac8679b30b5f98cb2393c531d2a7d4e12 Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Thu, 19 Jan 2017 00:43:45 +0100
Subject: [PATCH] [Qt] Use system defaults CA

The CA certificate we are bundling will expire in Aug/2018.
---
 platform/qt/qmapbox.qrc              |  6 ------
 platform/qt/qt4.cmake                |  2 --
 platform/qt/qt5.cmake                |  2 --
 platform/qt/resources/common.qrc     |  1 +
 platform/qt/src/http_file_source.cpp | 21 ---------------------
 platform/qt/src/http_file_source.hpp |  2 --
 6 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 platform/qt/qmapbox.qrc

diff --git a/platform/qt/qmapbox.qrc b/platform/qt/qmapbox.qrc
deleted file mode 100644
index de0c6cdced6..00000000000
--- a/platform/qt/qmapbox.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file alias="ca-bundle.crt">../../common/ca-bundle.crt</file>
-    <file alias="icon.png">../../common/icon.png</file>
-</qresource>
-</RCC>
diff --git a/platform/qt/qt4.cmake b/platform/qt/qt4.cmake
index 56e41e847a9..45c299c8a8d 100644
--- 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
index 687a041b18d..47e178d132b 100644
--- 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
index 9d409760cc4..d02c04a3c2d 100644
--- 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
index 9bf2cc5fac9..6831c040b0b 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 07767070697..4ba61b70da0 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