refactor: remove coretool use from tlsCertificate
This commit is contained in:
parent
e05b35dda4
commit
6990477504
2 changed files with 3 additions and 11 deletions
|
|
@ -8,8 +8,7 @@
|
||||||
#include "TlsCertificate.h"
|
#include "TlsCertificate.h"
|
||||||
|
|
||||||
#include "base/finally.h"
|
#include "base/finally.h"
|
||||||
#include "common/constants.h"
|
#include "common/Settings.h"
|
||||||
#include "gui/core/CoreTool.h"
|
|
||||||
#include "net/FingerprintData.h"
|
#include "net/FingerprintData.h"
|
||||||
#include "net/FingerprintDatabase.h"
|
#include "net/FingerprintDatabase.h"
|
||||||
#include "net/SecureUtils.h"
|
#include "net/SecureUtils.h"
|
||||||
|
|
@ -25,10 +24,6 @@
|
||||||
|
|
||||||
TlsCertificate::TlsCertificate(QObject *parent) : QObject(parent)
|
TlsCertificate::TlsCertificate(QObject *parent) : QObject(parent)
|
||||||
{
|
{
|
||||||
CoreTool coreTool;
|
|
||||||
m_profileDir = coreTool.getProfileDir();
|
|
||||||
if (m_profileDir.isEmpty())
|
|
||||||
qCritical() << "unable to get profile dir";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TlsCertificate::generateCertificate(const QString &path, int keyLength)
|
bool TlsCertificate::generateCertificate(const QString &path, int keyLength)
|
||||||
|
|
@ -77,12 +72,12 @@ int TlsCertificate::getCertKeyLength(const QString &path)
|
||||||
|
|
||||||
QString TlsCertificate::getCertificatePath() const
|
QString TlsCertificate::getCertificatePath() const
|
||||||
{
|
{
|
||||||
return QStringLiteral("%1/%2/%3").arg(m_profileDir, kTlsDirName, kTlsCertificateFilename);
|
return QStringLiteral("%1/%2/%3").arg(Settings::settingsPath(), kTlsDirName, kTlsCertificateFilename);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString TlsCertificate::getTlsDir() const
|
QString TlsCertificate::getTlsDir() const
|
||||||
{
|
{
|
||||||
return QStringLiteral("%1/%2").arg(m_profileDir, kTlsDirName);
|
return QStringLiteral("%1/%2").arg(Settings::settingsPath(), kTlsDirName);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TlsCertificate::isCertificateValid(const QString &path)
|
bool TlsCertificate::isCertificateValid(const QString &path)
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,4 @@ public:
|
||||||
int getCertKeyLength(const QString &path);
|
int getCertKeyLength(const QString &path);
|
||||||
QString getCertificatePath() const;
|
QString getCertificatePath() const;
|
||||||
QString getTlsDir() const;
|
QString getTlsDir() const;
|
||||||
|
|
||||||
private:
|
|
||||||
QString m_profileDir;
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue