1 files changed, 7 insertions, 5 deletions

diff --git a/src/plugins/tls/openssl/qsslcontext_openssl.cpp b/src/plugins/tls/openssl/qsslcontext_openssl.cpp
index 33f0d41a09..75c192bd01 100644
--- a/src/plugins/tls/openssl/qsslcontext_openssl.cpp
+++ b/src/plugins/tls/openssl/qsslcontext_openssl.cpp
@@ -218,7 +218,7 @@ SSL* QSslContext::createSsl()
     QList<QByteArray> protocols = sslConfiguration.d.constData()->nextAllowedProtocols;
     if (!protocols.isEmpty()) {
         m_supportedNPNVersions.clear();
-        for (int a = 0; a < protocols.count(); ++a) {
+        for (int a = 0; a < protocols.size(); ++a) {
             if (protocols.at(a).size() > 255) {
                 qCWarning(lcTlsBackend) << "TLS NPN extension" << protocols.at(a)
                                  << "is too long and will be ignored.";
@@ -230,7 +230,7 @@ SSL* QSslContext::createSsl()
         }
         if (m_supportedNPNVersions.size()) {
             m_npnContext.data = reinterpret_cast<unsigned char *>(m_supportedNPNVersions.data());
-            m_npnContext.len = m_supportedNPNVersions.length();
+            m_npnContext.len = m_supportedNPNVersions.size();
             m_npnContext.status = QSslConfiguration::NextProtocolNegotiationNone;
             // Callback's type has a parameter 'const unsigned char ** out'
             // since it was introduced in 1.0.2. Internally, OpenSSL's own code
@@ -632,7 +632,7 @@ QT_WARNING_POP
 
         // If we have any intermediate certificates then we need to add them to our chain
         bool first = true;
-        for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) {
+        for (const QSslCertificate &cert : std::as_const(configuration.d->localCertificateChain)) {
             if (first) {
                 first = false;
                 continue;
@@ -697,12 +697,14 @@ QT_WARNING_POP
         return;
     }
 
-    if (!dhparams.isEmpty()) {
+    if (dhparams.isEmpty()) {
+        q_SSL_CTX_set_dh_auto(sslContext->ctx, 1);
+    } else {
 #ifndef OPENSSL_NO_DEPRECATED_3_0
         const QByteArray &params = dhparams.d->derData;
         const char *ptr = params.constData();
         DH *dh = q_d2i_DHparams(nullptr, reinterpret_cast<const unsigned char **>(&ptr),
-                                params.length());
+                                params.size());
         if (dh == nullptr)
             qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form");
         q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh);