diff --git a/src/base/utils/net.cpp b/src/base/utils/net.cpp index 3f37b279f..aab83656c 100644 --- a/src/base/utils/net.cpp +++ b/src/base/utils/net.cpp @@ -87,11 +87,11 @@ namespace Utils protocolEquivalentAddress = QHostAddress(addr.toIPv4Address(&addrConversionOk)); } - for (const Subnet &subnet : subnets) - if (addr.isInSubnet(subnet) || (addrConversionOk && protocolEquivalentAddress.isInSubnet(subnet))) - return true; - - return false; + return std::any_of(subnets.begin(), subnets.end(), [&](const Subnet &subnet) + { + return addr.isInSubnet(subnet) + || (addrConversionOk && protocolEquivalentAddress.isInSubnet(subnet)); + }); } QString subnetToString(const Subnet &subnet) @@ -133,9 +133,11 @@ namespace Utils QList loadSSLCertificate(const QByteArray &data) { const QList certs {QSslCertificate::fromData(data)}; - if (std::any_of(certs.cbegin(), certs.cend(), [](const QSslCertificate &c) { return c.isNull(); })) - return {}; - return certs; + const bool hasInvalidCerts = std::any_of(certs.cbegin(), certs.cend(), [](const QSslCertificate &cert) + { + return cert.isNull(); + }); + return hasInvalidCerts ? QList() : certs; } bool isSSLCertificatesValid(const QByteArray &data) @@ -146,7 +148,7 @@ namespace Utils QSslKey loadSSLKey(const QByteArray &data) { // try different formats - QSslKey key {data, QSsl::Rsa}; + const QSslKey key {data, QSsl::Rsa}; if (!key.isNull()) return key; return {data, QSsl::Ec};