From eda1bcaef90ee7e6cfbdf163203cfd1fc42b9749 Mon Sep 17 00:00:00 2001
From: Comma Device <device@comma.ai>
Date: Sun, 2 May 2021 16:28:36 -0700
Subject: [PATCH] configure SSL globally on NEOS

old-commit-hash: 23faedd25eb6895c86bb890fdbf4f48889ecf4c3
---
 selfdrive/ui/main.cc                | 7 +++++++
 selfdrive/ui/qt/api.cc              | 7 -------
 selfdrive/ui/qt/widgets/ssh_keys.cc | 7 -------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/selfdrive/ui/main.cc b/selfdrive/ui/main.cc
index 42397d32a4..a60e7233d8 100644
--- a/selfdrive/ui/main.cc
+++ b/selfdrive/ui/main.cc
@@ -1,4 +1,5 @@
 #include <QApplication>
+#include <QSslConfiguration>
 
 #include "qt/window.hpp"
 #include "qt/qt_window.hpp"
@@ -18,6 +19,12 @@ int main(int argc, char *argv[]) {
   QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
 #endif
 
+#ifdef QCOM
+  QSslConfiguration ssl = QSslConfiguration::defaultConfiguration();
+  ssl.setCaCertificates(QSslCertificate::fromPath("/usr/etc/tls/cert.pem", QSsl::Pem, QRegExp::Wildcard));
+  QSslConfiguration::setDefaultConfiguration(ssl);
+#endif
+
   QApplication a(argc, argv);
   MainWindow w;
   setMainWindow(&w);
diff --git a/selfdrive/ui/qt/api.cc b/selfdrive/ui/qt/api.cc
index 43303cd72c..1763a8397c 100644
--- a/selfdrive/ui/qt/api.cc
+++ b/selfdrive/ui/qt/api.cc
@@ -104,13 +104,6 @@ void HttpRequest::sendRequest(const QString &requestURL){
   request.setUrl(QUrl(requestURL));
   request.setRawHeader(QByteArray("Authorization"), ("JWT " + token).toUtf8());
 
-#ifdef QCOM
-  QSslConfiguration ssl = QSslConfiguration::defaultConfiguration();
-  ssl.setCaCertificates(QSslCertificate::fromPath("/usr/etc/tls/cert.pem",
-                        QSsl::Pem, QRegExp::Wildcard));
-  request.setSslConfiguration(ssl);
-#endif
-
   reply = networkAccessManager->get(request);
 
   networkTimer->start();
diff --git a/selfdrive/ui/qt/widgets/ssh_keys.cc b/selfdrive/ui/qt/widgets/ssh_keys.cc
index a20a721ec0..5eeb22a871 100644
--- a/selfdrive/ui/qt/widgets/ssh_keys.cc
+++ b/selfdrive/ui/qt/widgets/ssh_keys.cc
@@ -67,13 +67,6 @@ void SshControl::getUserKeys(QString username){
 
   QNetworkRequest request;
   request.setUrl(QUrl(url));
-#ifdef QCOM
-  QSslConfiguration ssl = QSslConfiguration::defaultConfiguration();
-  ssl.setCaCertificates(QSslCertificate::fromPath("/usr/etc/tls/cert.pem",
-                        QSsl::Pem, QRegExp::Wildcard));
-  request.setSslConfiguration(ssl);
-#endif
-
   reply = manager->get(request);
   connect(reply, &QNetworkReply::finished, this, &SshControl::parseResponse);
   networkTimer->start();