From 6f10cd269e76b631b6484bb505d27ebc5f4bf7bb Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sat, 22 Nov 2025 10:29:47 -0500 Subject: [PATCH] refactor: move TlsCertificate::getCertKeyLength -> static TlsUtility::getCertKeyLength --- src/lib/gui/dialogs/SettingsDialog.cpp | 3 +-- src/lib/gui/tls/TlsCertificate.cpp | 5 ----- src/lib/gui/tls/TlsCertificate.h | 1 - src/lib/gui/tls/TlsUtility.cpp | 6 ++++++ src/lib/gui/tls/TlsUtility.h | 7 +++++++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/lib/gui/dialogs/SettingsDialog.cpp b/src/lib/gui/dialogs/SettingsDialog.cpp index f99de7671..82b33ab97 100644 --- a/src/lib/gui/dialogs/SettingsDialog.cpp +++ b/src/lib/gui/dialogs/SettingsDialog.cpp @@ -264,12 +264,11 @@ bool SettingsDialog::isClientMode() const void SettingsDialog::updateKeyLengthOnFile(const QString &path) { - TlsCertificate ssl; if (!QFile(path).exists()) { qFatal("tls certificate file not found: %s", qUtf8Printable(path)); } - auto length = ssl.getCertKeyLength(path); + auto length = TlsUtility::getCertKeyLength(path); auto labelIcon = QPixmap(QIcon::fromTheme(QIcon::ThemeIcon::SecurityLow).pixmap(24, 24)); if (length == 2048) labelIcon = QPixmap(QIcon::fromTheme(QStringLiteral("security-medium")).pixmap(24, 24)); diff --git a/src/lib/gui/tls/TlsCertificate.cpp b/src/lib/gui/tls/TlsCertificate.cpp index 0428b778e..6fa6158f7 100644 --- a/src/lib/gui/tls/TlsCertificate.cpp +++ b/src/lib/gui/tls/TlsCertificate.cpp @@ -47,8 +47,3 @@ bool TlsCertificate::generateFingerprint(const QString &certificateFilename) con db.addTrusted(deskflow::pemFileCertFingerprint(certPath, Fingerprint::Type::SHA256)); return db.write(Settings::tlsLocalDb()); } - -int TlsCertificate::getCertKeyLength(const QString &path) const -{ - return deskflow::getCertLength(path.toStdString()); -} diff --git a/src/lib/gui/tls/TlsCertificate.h b/src/lib/gui/tls/TlsCertificate.h index 1f6cd7b68..86209a8e3 100644 --- a/src/lib/gui/tls/TlsCertificate.h +++ b/src/lib/gui/tls/TlsCertificate.h @@ -18,5 +18,4 @@ public: bool generateCertificate(const QString &path, int keyLength) const; bool generateFingerprint(const QString &certificateFilename) const; - int getCertKeyLength(const QString &path) const; }; diff --git a/src/lib/gui/tls/TlsUtility.cpp b/src/lib/gui/tls/TlsUtility.cpp index 7a8da0e72..9d6e51630 100644 --- a/src/lib/gui/tls/TlsUtility.cpp +++ b/src/lib/gui/tls/TlsUtility.cpp @@ -9,6 +9,7 @@ #include "TlsCertificate.h" #include "common/Settings.h" +#include "net/SecureUtils.h" #include #include @@ -64,6 +65,11 @@ bool TlsUtility::isCertValid(const QString &certPath) return true; } +int TlsUtility::getCertKeyLength(const QString &certPath) +{ + return deskflow::getCertLength(certPath.toStdString()); +} + bool TlsUtility::generateCertificate() const { qDebug( diff --git a/src/lib/gui/tls/TlsUtility.h b/src/lib/gui/tls/TlsUtility.h index 1f4e3637c..28bfb35be 100644 --- a/src/lib/gui/tls/TlsUtility.h +++ b/src/lib/gui/tls/TlsUtility.h @@ -36,6 +36,13 @@ public: */ static bool isCertValid(const QString &certPath = Settings::value(Settings::Security::Certificate).toString()); + /** + * @brief Get the lenght of a key + * @param certPath path of the file to check, when unset will use the value of Settings::Security::Certificate + * @return the bitsize of the key + */ + static int getCertKeyLength(const QString &certPath = Settings::value(Settings::Security::Certificate).toString()); + private: TlsCertificate m_certificate; };