diff --git a/Makefile.common b/Makefile.common index 09ab22222d..48b1b3b1bc 100644 --- a/Makefile.common +++ b/Makefile.common @@ -332,6 +332,11 @@ endif # Qt WIMP GUI +ifeq ($(HAVE_OPENSSL), 1) +DEFINES += $(OPENSSL_CFLAGS) +LIBS += $(OPENSSL_LIBS) +endif + ifeq ($(HAVE_QT), 1) OBJ += ui/drivers/ui_qt.o \ ui/drivers/qt/ui_qt_application.o \ diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 1a1da11dde..d0d94da004 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -281,6 +281,7 @@ if [ "$HAVE_QT" != 'no' ] && [ "$MOC_PATH" != 'none' ]; then check_pkgconf QT5CONCURRENT Qt5Concurrent 5.2 check_pkgconf QT5NETWORK Qt5Network 5.2 #check_pkgconf QT5WEBENGINE Qt5WebEngine 5.4 + check_pkgconf OPENSSL openssl 1.0.0 check_val '' QT5CORE -lQt5Core QT5CORE check_val '' QT5GUI -lQt5Gui QT5GUI @@ -288,6 +289,7 @@ if [ "$HAVE_QT" != 'no' ] && [ "$MOC_PATH" != 'none' ]; then check_val '' QT5CONCURRENT -lQt5Concurrent QT5CONCURRENT check_val '' QT5NETWORK -lQt5Network QT5NETWORK #check_val '' QT5WEBENGINE -lQt5WebEngine QT5WEBENGINE + check_val '' OPENSSL -lssl OPENSSL if [ "$HAVE_QT5CORE" = "no" ] || [ "$HAVE_QT5GUI" = "no" ] || [ "$HAVE_QT5WIDGETS" = "no" ] || [ "$HAVE_QT5CONCURRENT" = "no" ] || [ "$HAVE_QT5NETWORK" = "no" ]; then die : 'Notice: Not building Qt support, required libraries were not found.' diff --git a/ui/drivers/qt/ui_qt_window.cpp b/ui/drivers/qt/ui_qt_window.cpp index 78ccdd45f7..d873443ee0 100644 --- a/ui/drivers/qt/ui_qt_window.cpp +++ b/ui/drivers/qt/ui_qt_window.cpp @@ -73,6 +73,8 @@ extern "C" { #include #include #include +#include +#include } #include "../../../AUTHORS.h" @@ -572,6 +574,14 @@ MainWindow::MainWindow(QWidget *parent) : #endif removeUpdateTempFiles(); + + { + const SSL_METHOD* method = TLSv1_method(); + + RARCH_LOG("[Qt]: Using %s\n", OPENSSL_VERSION_TEXT); + + RARCH_LOG("[Qt]: TLSv1 supports %d ciphers.\n", method->num_ciphers()); + } } MainWindow::~MainWindow()