chore: remove unused Settings::tlsLocalDb we no longer use the local fingerprint file
This commit is contained in:
parent
ad01e296dc
commit
0d5d66b880
5 changed files with 0 additions and 15 deletions
|
|
@ -26,7 +26,6 @@ const auto kCoreBinName = "@CORE_BINARY@";
|
||||||
|
|
||||||
const auto kTlsDirName = "tls";
|
const auto kTlsDirName = "tls";
|
||||||
const auto kTlsCertificateFilename = "@CMAKE_PROJECT_NAME@.pem";
|
const auto kTlsCertificateFilename = "@CMAKE_PROJECT_NAME@.pem";
|
||||||
const auto kTlsFingerprintLocalFilename = "local-fingerprint";
|
|
||||||
const auto kTlsFingerprintTrustedServersFilename = "trusted-servers";
|
const auto kTlsFingerprintTrustedServersFilename = "trusted-servers";
|
||||||
const auto kTlsFingerprintTrustedClientsFilename = "trusted-clients";
|
const auto kTlsFingerprintTrustedClientsFilename = "trusted-clients";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -286,11 +286,6 @@ QString Settings::tlsDir()
|
||||||
return QStringLiteral("%1/%2").arg(instance()->settingsPath(), kTlsDirName);
|
return QStringLiteral("%1/%2").arg(instance()->settingsPath(), kTlsDirName);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Settings::tlsLocalDb()
|
|
||||||
{
|
|
||||||
return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintLocalFilename);
|
|
||||||
}
|
|
||||||
|
|
||||||
QString Settings::tlsTrustedServersDb()
|
QString Settings::tlsTrustedServersDb()
|
||||||
{
|
{
|
||||||
return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintTrustedServersFilename);
|
return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintTrustedServersFilename);
|
||||||
|
|
|
||||||
|
|
@ -128,7 +128,6 @@ public:
|
||||||
static QString settingsFile();
|
static QString settingsFile();
|
||||||
static QString settingsPath();
|
static QString settingsPath();
|
||||||
static QString tlsDir();
|
static QString tlsDir();
|
||||||
static QString tlsLocalDb();
|
|
||||||
static QString tlsTrustedServersDb();
|
static QString tlsTrustedServersDb();
|
||||||
static QString tlsTrustedClientsDb();
|
static QString tlsTrustedClientsDb();
|
||||||
static QString logLevelText();
|
static QString logLevelText();
|
||||||
|
|
|
||||||
|
|
@ -41,11 +41,6 @@ void SettingsTests::tlsDir()
|
||||||
QVERIFY(Settings::tlsDir().endsWith(m_expectedTlsDir));
|
QVERIFY(Settings::tlsDir().endsWith(m_expectedTlsDir));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsTests::tlsLocalDb()
|
|
||||||
{
|
|
||||||
QVERIFY(Settings::tlsLocalDb().endsWith(m_expectedTlsLocalDB));
|
|
||||||
}
|
|
||||||
|
|
||||||
void SettingsTests::tlsTrustedServersDb()
|
void SettingsTests::tlsTrustedServersDb()
|
||||||
{
|
{
|
||||||
QVERIFY(Settings::tlsTrustedServersDb().endsWith(m_expectedTlsServerDB));
|
QVERIFY(Settings::tlsTrustedServersDb().endsWith(m_expectedTlsServerDB));
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@ private Q_SLOTS:
|
||||||
void settingsFile();
|
void settingsFile();
|
||||||
void settingsPath();
|
void settingsPath();
|
||||||
void tlsDir();
|
void tlsDir();
|
||||||
void tlsLocalDb();
|
|
||||||
void tlsTrustedServersDb();
|
void tlsTrustedServersDb();
|
||||||
void tlsTrustedClientsDb();
|
void tlsTrustedClientsDb();
|
||||||
void checkValidSettings();
|
void checkValidSettings();
|
||||||
|
|
@ -40,8 +39,6 @@ private:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
inline static const QString m_expectedTlsDir = QStringLiteral("%1/%2").arg(m_settingsPath, kTlsDirName);
|
inline static const QString m_expectedTlsDir = QStringLiteral("%1/%2").arg(m_settingsPath, kTlsDirName);
|
||||||
inline static const QString m_expectedTlsLocalDB =
|
|
||||||
QStringLiteral("%1/%2").arg(m_expectedTlsDir, kTlsFingerprintLocalFilename);
|
|
||||||
inline static const QString m_expectedTlsServerDB =
|
inline static const QString m_expectedTlsServerDB =
|
||||||
QStringLiteral("%1/%2").arg(m_expectedTlsDir, kTlsFingerprintTrustedServersFilename);
|
QStringLiteral("%1/%2").arg(m_expectedTlsDir, kTlsFingerprintTrustedServersFilename);
|
||||||
inline static const QString m_expectedTlsClientDB =
|
inline static const QString m_expectedTlsClientDB =
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue