fix SSL errors in Qt UI on NEOS (#20225)

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 60a9443b61
commatwo_master
Adeeb Shihadeh 5 years ago committed by GitHub
parent f8966cecae
commit 54df1204e8
  1. 2
      selfdrive/ui/SConscript
  2. 8
      selfdrive/ui/qt/api.cc
  3. 22
      selfdrive/ui/tests/ssl_test.cc

@ -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)

@ -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);

@ -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();
}
Loading…
Cancel
Save