From 54df1204e8181164074e100fcff3b632885fee55 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Tue, 2 Mar 2021 20:46:46 -0800
Subject: [PATCH] fix SSL errors in Qt UI on NEOS (#20225)

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 60a9443b61af66976533fe4d26422740db392171
---
 selfdrive/ui/SConscript        |  2 --
 selfdrive/ui/qt/api.cc         |  8 ++++----
 selfdrive/ui/tests/ssl_test.cc | 22 ----------------------
 3 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 selfdrive/ui/tests/ssl_test.cc

diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript
index 11ff32ba15..247d913a2b 100644
--- a/selfdrive/ui/SConscript
+++ b/selfdrive/ui/SConscript
@@ -43,8 +43,6 @@ else:
   qt_env.Program("qt/text", ["qt/text.cc"], LIBS=qt_base_libs)
   qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_base_libs)
 
-  #qt_env.Program("tests/ssl_test", ["tests/ssl_test.cc"], LIBS=qt_base_libs)
-
   # build setup, factory resetter, and installer
   if "BUILD_SETUP" in os.environ:
     qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs)
diff --git a/selfdrive/ui/qt/api.cc b/selfdrive/ui/qt/api.cc
index 5e92083039..92bc7e95cc 100644
--- a/selfdrive/ui/qt/api.cc
+++ b/selfdrive/ui/qt/api.cc
@@ -15,6 +15,8 @@
 #include "common/params.h"
 #include "common/util.h"
 
+#include <QSslSocket>
+
 #if defined(QCOM) || defined(QCOM2)
 const std::string private_key_path = "/persist/comma/id_rsa";
 #else
@@ -110,14 +112,12 @@ void RequestRepeater::sendRequest(QString requestURL, QVector<QPair<QString, QJs
   request.setUrl(QUrl(requestURL));
   request.setRawHeader(QByteArray("Authorization"), ("JWT " + token).toUtf8());
 
-  // TODO: fix this
-/*
 #ifdef QCOM
   QSslConfiguration ssl = QSslConfiguration::defaultConfiguration();
-  ssl.setPeerVerifyMode(QSslSocket::VerifyNone);
+  ssl.setCaCertificates(certsQSslCertificate::fromPath("/usr/etc/tls/cert.pem",
+                        QSsl::Pem, QRegExp::Wildcard));
   request.setSslConfiguration(ssl);
 #endif
-*/
 
   reply = networkAccessManager->get(request);
 
diff --git a/selfdrive/ui/tests/ssl_test.cc b/selfdrive/ui/tests/ssl_test.cc
deleted file mode 100644
index acb38de7ea..0000000000
--- a/selfdrive/ui/tests/ssl_test.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <QDebug>
-#include <QApplication>
-#include <QSslSocket>
-#include <QNetworkProxy>
-
-int main(int argc, char **argv) {
-  QCoreApplication app(argc, argv);
-  QSslSocket socket;
-
-  socket.setPeerVerifyMode(QSslSocket::VerifyNone);
-
-  qDebug() << "Supports SSL: " << QSslSocket::supportsSsl();
-  qDebug() << "Version: " << QSslSocket::sslLibraryVersionString() << " " << QSslSocket::sslLibraryVersionNumber();
-  qDebug() << "Build Version: " << QSslSocket::sslLibraryBuildVersionString() << " " << QSslSocket::sslLibraryBuildVersionNumber();
-
-  socket.connectToHost("www.google.com", 443);
-
-  socket.write("GET / HTTP/1.1rnrn");
-
-  while (socket.waitForReadyRead())
-    qDebug() << socket.readAll().data();
-}