diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp index 76ea6dede..c08474ee4 100644 --- a/src/apps/deskflow-gui/MainWindow.cpp +++ b/src/apps/deskflow-gui/MainWindow.cpp @@ -1146,8 +1146,7 @@ void MainWindow::setHostName() QString MainWindow::trustedFingerprintDb() { const bool isClient = m_coreProcess.mode() == CoreMode::Client; - const auto trustFile = isClient ? Settings::tlsTrustedServersDb() : kTlsFingerprintTrustedClientsFilename; - return QStringLiteral("%1/%2").arg(Settings::tlsDir(), trustFile); + return isClient ? Settings::tlsTrustedServersDb() : Settings::tlsTrustedClientsDb(); } bool MainWindow::regenerateLocalFingerprints() diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp index f6124cc70..9a38c2085 100644 --- a/src/lib/common/Settings.cpp +++ b/src/lib/common/Settings.cpp @@ -176,6 +176,11 @@ const QString Settings::tlsTrustedServersDb() return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintTrustedServersFilename); } +const QString Settings::tlsTrustedClientsDb() +{ + return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintTrustedClientsFilename); +} + void Settings::setValue(const QString &key, const QVariant &value) { if (instance()->m_settings->value(key) == value) diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h index 5c873252b..5d03d6f1c 100644 --- a/src/lib/common/Settings.h +++ b/src/lib/common/Settings.h @@ -144,6 +144,7 @@ public: static const QString tlsDir(); static const QString tlsLocalDb(); static const QString tlsTrustedServersDb(); + static const QString tlsTrustedClientsDb(); static const QString logLevelText(); static QSettingsProxy &proxy(); static void save(bool emitSaving = true); diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp index 5abf4ce07..6ab01eea5 100644 --- a/src/lib/net/SecureSocket.cpp +++ b/src/lib/net/SecureSocket.cpp @@ -448,9 +448,7 @@ int SecureSocket::secureAccept(int socket) // If not fatal and no retry, state is good if (retry == 0) { if (m_securityLevel == SecurityLevel::PeerAuth) { - std::string dbDir = deskflow::string::sprintf( - "%s/%s", Settings::tlsDir().toStdString().c_str(), kTlsFingerprintTrustedClientsFilename - ); + std::string dbDir = Settings::tlsTrustedClientsDb().toStdString().c_str(); if (!verifyCertFingerprint(dbDir)) { retry = 0; disconnect();