refactor: remove unused TlsCertificate::isCertificateValid

This commit is contained in:
sithlord48
2025-11-22 11:05:17 -05:00
committed by Nick Bolton
parent 91b9680643
commit 393c2fa9bc
7 changed files with 0 additions and 164 deletions

View File

@ -7,20 +7,12 @@
#include "TlsCertificate.h"
#include "base/FinalAction.h"
#include "common/Settings.h"
#include "io/Filesystem.h"
#include "net/Fingerprint.h"
#include "net/FingerprintDatabase.h"
#include "net/SecureUtils.h"
#include <QDir>
#include <QProcess>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/x509.h>
TlsCertificate::TlsCertificate(QObject *parent) : QObject(parent)
{
@ -60,43 +52,3 @@ int TlsCertificate::getCertKeyLength(const QString &path) const
{
return deskflow::getCertLength(path.toStdString());
}
bool TlsCertificate::isCertificateValid(const QString &path) const
{
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
auto fp = deskflow::fopenUtf8Path(path.toStdString(), "r");
if (!fp) {
qWarning() << tr("could not read from default certificate file");
return false;
}
auto fileClose = deskflow::finally([fp]() { std::fclose(fp); });
auto *cert = PEM_read_X509(fp, nullptr, nullptr, nullptr);
if (!cert) {
qWarning() << tr("could not load default certificate file to memory");
return false;
}
auto certFree = deskflow::finally([cert]() { X509_free(cert); });
auto *pubkey = X509_get_pubkey(cert);
if (!pubkey) {
qWarning() << tr("default certificate key file does not contain valid public key");
return false;
}
auto pubkeyFree = deskflow::finally([pubkey]() { EVP_PKEY_free(pubkey); });
if (auto type = EVP_PKEY_type(EVP_PKEY_id(pubkey)); type != EVP_PKEY_RSA && type != EVP_PKEY_DSA) {
qWarning() << tr("public key in default certificate key file is not RSA or DSA");
return false;
}
if (EVP_PKEY_bits(pubkey) < 2048) {
// We could have small keys in old barrier installations
qWarning() << tr("public key in default certificate key file is too small");
return false;
}
return true;
}

View File

@ -16,7 +16,6 @@ class TlsCertificate : public QObject
public:
explicit TlsCertificate(QObject *parent = nullptr);
bool isCertificateValid(const QString &path) const;
bool generateCertificate(const QString &path, int keyLength) const;
bool generateFingerprint(const QString &certificateFilename) const;
int getCertKeyLength(const QString &path) const;

View File

@ -1265,29 +1265,6 @@ Al habilitar esta opción, se deshabilitará la interfaz gráfica de usuario (GU
<translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Requiere el paquete wl-clipboard&lt;/p&gt;&lt;p&gt;Al usar wl-clipboard v2.2.1, existe un error que provoca la pérdida del foco y que puede dificultar el uso de Deskflow. Este error se ha corregido al usar la rama principal de wl-clipboard, a menos que su Compositor no sea compatible con el protocolo wlroots-data-control.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
</context>
<context>
<name>TlsCertificate</name>
<message>
<source>could not read from default certificate file</source>
<translation type="unfinished">No se pudo leer el archivo de certificado predeterminado</translation>
</message>
<message>
<source>could not load default certificate file to memory</source>
<translation type="unfinished">No se pudo cargar el archivo de certificado predeterminado en la memoria</translation>
</message>
<message>
<source>default certificate key file does not contain valid public key</source>
<translation type="unfinished">El archivo de clave de certificado predeterminado no contiene una clave pública válida</translation>
</message>
<message>
<source>public key in default certificate key file is not RSA or DSA</source>
<translation type="unfinished">La clave pública en el archivo de clave de certificado predeterminado no es RSA ni DSA</translation>
</message>
<message>
<source>public key in default certificate key file is too small</source>
<translation type="unfinished">La clave pública en el archivo de clave del certificado predeterminado es demasiado pequeña</translation>
</message>
</context>
<context>
<name>deskflow::gui::TlsUtility</name>
<message>

View File

@ -1265,29 +1265,6 @@ L&apos;abilitazione di questa impostazione disabiliterà l&apos;interfaccia graf
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Richiede il pacchetto wl-clipboard&lt;/p&gt;&lt;p&gt;Quando si utilizza wl-clipboard v2.2.1, si verifica un bug di furto del focus che potrebbe rendere Deskflow più difficile da usare. Questo problema è stato risolto quando si utilizza il ramo master di wl-clipboard, a meno che il proprio compositore non supporti il protocollo wlroots-data-control.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
</context>
<context>
<name>TlsCertificate</name>
<message>
<source>could not read from default certificate file</source>
<translation>Impossibile leggere dal file di certificato predefinito</translation>
</message>
<message>
<source>could not load default certificate file to memory</source>
<translation>Impossibile caricare il file di certificato predefinito in memoria</translation>
</message>
<message>
<source>default certificate key file does not contain valid public key</source>
<translation>Il file della chiave del certificato predefinito non contiene una chiave pubblica valida</translation>
</message>
<message>
<source>public key in default certificate key file is not RSA or DSA</source>
<translation>La chiave pubblica nel file della chiave del certificato predefinito non è RSA o DSA</translation>
</message>
<message>
<source>public key in default certificate key file is too small</source>
<translation>La chiave pubblica nel file della chiave del certificato predefinito è troppo piccola</translation>
</message>
</context>
<context>
<name>deskflow::gui::TlsUtility</name>
<message>

View File

@ -1266,29 +1266,6 @@ Enabling this setting will disable the server config GUI.</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;wl-clipboard &lt;/p&gt;&lt;p&gt;wl-clipboard v2.2.1 使 Deskflow 使 wl-clipboard 使 wlroots-data-control &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
</context>
<context>
<name>TlsCertificate</name>
<message>
<source>could not read from default certificate file</source>
<translation></translation>
</message>
<message>
<source>could not load default certificate file to memory</source>
<translation></translation>
</message>
<message>
<source>default certificate key file does not contain valid public key</source>
<translation></translation>
</message>
<message>
<source>public key in default certificate key file is not RSA or DSA</source>
<translation>RSAでもDSAでもありません</translation>
</message>
<message>
<source>public key in default certificate key file is too small</source>
<translation></translation>
</message>
</context>
<context>
<name>deskflow::gui::TlsUtility</name>
<message>

View File

@ -1270,29 +1270,6 @@ Enabling this setting will disable the server config GUI.</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Для этого необходим пакет wl-clipboard.&lt;/p&gt;&lt;p&gt;Когда ты используешь wl-clipboard v2.2.1. Возникает ошибка перехвата фокуса, которая мешает использовать deskflowю. Это фиксется если использовать wl-clipboard из ветки master, если только ваш Compositor не поддерживает протокол wlroots-data-control.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
</context>
<context>
<name>TlsCertificate</name>
<message>
<source>could not read from default certificate file</source>
<translation>Не смог прочитать стандартный файл сертификата</translation>
</message>
<message>
<source>could not load default certificate file to memory</source>
<translation>Не получилось загрузить стандартный файл сертификата в память</translation>
</message>
<message>
<source>default certificate key file does not contain valid public key</source>
<translation>Стандартный файл сертификата не содержит действительного публичного ключа</translation>
</message>
<message>
<source>public key in default certificate key file is not RSA or DSA</source>
<translation>Публичный ключ в стандартном файле сертефеката не является RSA или DSA</translation>
</message>
<message>
<source>public key in default certificate key file is too small</source>
<translation>Публичный ключ в стандартном файле сертификата слишком мал</translation>
</message>
</context>
<context>
<name>deskflow::gui::TlsUtility</name>
<message>

View File

@ -1266,29 +1266,6 @@ Enabling this setting will disable the server config GUI.</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; wl-clipboard &lt;/p&gt;&lt;p&gt;使 wl-clipboard v2.2.1 Bug Deskflow 使便 wl-clipboard master wlroots-data-control &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
</context>
<context>
<name>TlsCertificate</name>
<message>
<source>could not read from default certificate file</source>
<translation></translation>
</message>
<message>
<source>could not load default certificate file to memory</source>
<translation></translation>
</message>
<message>
<source>default certificate key file does not contain valid public key</source>
<translation></translation>
</message>
<message>
<source>public key in default certificate key file is not RSA or DSA</source>
<translation> RSA DSA</translation>
</message>
<message>
<source>public key in default certificate key file is too small</source>
<translation></translation>
</message>
</context>
<context>
<name>deskflow::gui::TlsUtility</name>
<message>