diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2025-08-21 11:07:39 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2025-08-23 07:13:50 +0000 |
| commit | 43f00ae9f8ec487e60c9e3703e06f015cf960221 (patch) | |
| tree | cbcfd76723285162e5805f6a16730109ef33dbf6 | |
| parent | e5d30eb9ee924d721fcaa82d91fcbbd6a7015aee (diff) | |
OpenSSL: fix implicit char* to QString construction
The plugin is not yet built with the constructor disabled,
so it is an easy thing to miss.
Amends 1493a6e8841dcfb8354f841585ac08ed35e9363b.
Change-Id: I4ed5c9ed2282b96b04603a7a8ff07f5964ff5f2d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
| -rw-r--r-- | src/plugins/tls/openssl/qtlskey_openssl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/tls/openssl/qtlskey_openssl.cpp b/src/plugins/tls/openssl/qtlskey_openssl.cpp index 0dafb85c836..6b39273b679 100644 --- a/src/plugins/tls/openssl/qtlskey_openssl.cpp +++ b/src/plugins/tls/openssl/qtlskey_openssl.cpp @@ -397,7 +397,7 @@ bool TlsKeyOpenSSL::fromEVP_PKEY(EVP_PKEY *pkey) #if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3 // ML-DSA don't have NIDs - const QString keyTypeName = q_EVP_PKEY_type_name(pkey); + const auto keyTypeName = QLatin1StringView(q_EVP_PKEY_type_name(pkey)); if (keyTypeName.contains(QLatin1String("ML-DSA")) || keyTypeName.contains(QLatin1String("mldsa"))) { keyAlgorithm = QSsl::MlDsa; @@ -549,7 +549,7 @@ TlsKeyOpenSSL *TlsKeyOpenSSL::publicKeyFromX509(X509 *x) #if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3 // ML-DSA don't have NIDs - const QString keyTypeName = q_EVP_PKEY_type_name(pkey); + const auto keyTypeName = QLatin1StringView(q_EVP_PKEY_type_name(pkey)); #endif if (keyType == EVP_PKEY_RSA) { |