rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6555 from Waester/ssl-fingerprint-fix-PR 

Fix certificate generation and empty fingerprint information.
This commit is contained in:
Jnewbon 2019-10-18 15:29:52 +01:00 committed by GitHub
parent 277f38a4dc d79c8635e0
commit 5990f874ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/src/AboutDialogBase.ui
View File

@ -52,7 +52,7 @@
<property name="text"> <property name="text">
<string>&lt;p&gt; <string>&lt;p&gt;
Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt; Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt;
Copyright © 2012-2016 Symless Ltd.&lt;br /&gt; Copyright © 2012-2019 Symless Ltd.&lt;br /&gt;
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt; Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt;
Synergy is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt; Synergy is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt;
Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.&lt;br /&gt; Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.&lt;br /&gt;

8
src/gui/src/MainWindow.cpp
View File

@ -140,6 +140,8 @@ MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig,
// hide padlock icon // hide padlock icon
secureSocket(false); secureSocket(false);
sslToggled(appConfig.getCryptoEnabled());
connect (this, SIGNAL(windowShown()), connect (this, SIGNAL(windowShown()),
this, SLOT(on_windowShown()), Qt::QueuedConnection); this, SLOT(on_windowShown()), Qt::QueuedConnection);
#ifndef SYNERGY_ENTERPRISE #ifndef SYNERGY_ENTERPRISE
@ -1104,12 +1106,6 @@ void MainWindow::setEdition(Edition edition)
#ifndef SYNERGY_ENTERPRISE #ifndef SYNERGY_ENTERPRISE
setWindowTitle(m_LicenseManager->getEditionName (edition)); setWindowTitle(m_LicenseManager->getEditionName (edition));
#endif #endif
if (m_AppConfig->getCryptoEnabled()) {
m_pSslCertificate = new SslCertificate(this);
m_pSslCertificate->generateCertificate();
}
updateLocalFingerprint();
saveSettings();
} }
#ifndef SYNERGY_ENTERPRISE #ifndef SYNERGY_ENTERPRISE

4
src/gui/src/SslCertificate.cpp
View File

@ -34,8 +34,8 @@ static const char kSslDir[] = "SSL";
static const char kUnixOpenSslCommand[] = "openssl"; static const char kUnixOpenSslCommand[] = "openssl";
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
static const char kWinOpenSslBinary[] = "OpenSSL\\openssl.exe"; static const char kWinOpenSslBinary[] = "openssl.exe";
static const char kConfigFile[] = "OpenSSL\\synergy.conf"; static const char kConfigFile[] = "synergy.conf";
#endif #endif
SslCertificate::SslCertificate(QObject *parent) : SslCertificate::SslCertificate(QObject *parent) :