From 5d271bcb2188c052b2a57982661c309d10859c0d Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Mon, 3 Nov 2025 12:33:25 +0000 Subject: Modernize the certificate fetching code in ssl_openssl. It is 2025 and we are using C++17 there is no need to declare variables like we are using C89. --- src/modules/extra/m_ssl_openssl.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/modules') diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 5a85f3586..e5f05b586 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -605,14 +605,10 @@ private: void VerifyCertificate() { - X509* cert; auto* certinfo = new ssl_cert(); this->certificate = certinfo; - unsigned int n; - unsigned char md[EVP_MAX_MD_SIZE]; - - cert = SSL_get_peer_certificate(sess); + auto* cert = SSL_get_peer_certificate(sess); if (!cert) { certinfo->error = "Could not get peer certificate: "+std::string(get_error()); @@ -653,15 +649,17 @@ private: GetDNString(X509_get_subject_name(cert), certinfo->dn); GetDNString(X509_get_issuer_name(cert), certinfo->issuer); + unsigned int mdlen; + unsigned char md[EVP_MAX_MD_SIZE]; for (const auto* digest : GetProfile().GetDigests()) { - if (!X509_digest(cert, digest, md, &n)) + if (!X509_digest(cert, digest, md, &mdlen)) { certinfo->error = "Out of memory generating fingerprint"; } else { - certinfo->fingerprints.push_back(Hex::Encode(md, n)); + certinfo->fingerprints.push_back(Hex::Encode(md, mdlen)); } } -- cgit v1.3.1-10-gc9f91