From 1bc2cf57d90533bc3a4f4a029f4bab74caa12275 Mon Sep 17 00:00:00 2001 From: walker0643 <> Date: Sun, 28 Jan 2018 16:56:16 -0500 Subject: [PATCH 1/2] change openssl path relative to binary --- src/gui/src/SslCertificate.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/src/SslCertificate.cpp b/src/gui/src/SslCertificate.cpp index 1ea4b259..d400215a 100644 --- a/src/gui/src/SslCertificate.cpp +++ b/src/gui/src/SslCertificate.cpp @@ -34,8 +34,8 @@ static const char kSslDir[] = "SSL"; static const char kUnixOpenSslCommand[] = "openssl"; #if defined(Q_OS_WIN) -static const char kWinOpenSslBinary[] = "OpenSSL\\openssl.exe"; -static const char kConfigFile[] = "OpenSSL\\synergy.conf"; +static const char kWinOpenSslBinary[] = "openssl.exe"; +static const char kConfigFile[] = "synergy.conf"; #endif SslCertificate::SslCertificate(QObject *parent) : From d79c8635e05e30c60cc5e17a87ce20e253c65d41 Mon Sep 17 00:00:00 2001 From: walker0643 <> Date: Sat, 27 Jan 2018 20:50:30 -0500 Subject: [PATCH 2/2] fix SSL fingerprint text and about box copyright text --- src/gui/src/AboutDialogBase.ui | 2 +- src/gui/src/MainWindow.cpp | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/gui/src/AboutDialogBase.ui b/src/gui/src/AboutDialogBase.ui index b20e3a50..b2cbe5e1 100644 --- a/src/gui/src/AboutDialogBase.ui +++ b/src/gui/src/AboutDialogBase.ui @@ -52,7 +52,7 @@ <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> -Copyright © 2012-2016 Symless Ltd.<br /> +Copyright © 2012-2019 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> Synergy is released under the GNU General Public License (GPLv2).<br /><br /> Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 499ca99b..33c89ae4 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -140,6 +140,8 @@ MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig, // hide padlock icon secureSocket(false); + sslToggled(appConfig.getCryptoEnabled()); + connect (this, SIGNAL(windowShown()), this, SLOT(on_windowShown()), Qt::QueuedConnection); #ifndef SYNERGY_ENTERPRISE @@ -1104,12 +1106,6 @@ void MainWindow::setEdition(Edition edition) #ifndef SYNERGY_ENTERPRISE setWindowTitle(m_LicenseManager->getEditionName (edition)); #endif - if (m_AppConfig->getCryptoEnabled()) { - m_pSslCertificate = new SslCertificate(this); - m_pSslCertificate->generateCertificate(); - } - updateLocalFingerprint(); - saveSettings(); } #ifndef SYNERGY_ENTERPRISE