From 734ab493f7c05e06f4c8bc99884d8a99612c79c0 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 4 Mar 2021 10:52:44 +0100 Subject: Fix a BIC introduced by extending the namespace QSsl in _p.h files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renamed the private part of the namespace to QTlsPrivate. Fixes: QTBUG-91531 Change-Id: Id2d9c458d8d958b35e437eee42889177dad0a7a7 Reviewed-by: Mårten Nordheim (cherry picked from commit e4efa00c72c7011f4e5c27722c2a522b30274610) Reviewed-by: Qt Cherry-pick Bot --- src/network/ssl/qsslsocket_schannel.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/network/ssl/qsslsocket_schannel.cpp') diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp index 982db74e11..debcc42084 100644 --- a/src/network/ssl/qsslsocket_schannel.cpp +++ b/src/network/ssl/qsslsocket_schannel.cpp @@ -212,24 +212,24 @@ QList QSchannelBackend::implementedClasses() const return classes; } -QSsl::TlsKey *QSchannelBackend::createKey() const +QTlsPrivate::TlsKey *QSchannelBackend::createKey() const { - return new QSsl::TlsKeySchannel; + return new QTlsPrivate::TlsKeySchannel; } -QSsl::X509Certificate *QSchannelBackend::createCertificate() const +QTlsPrivate::X509Certificate *QSchannelBackend::createCertificate() const { - return new QSsl::X509CertificateSchannel; + return new QTlsPrivate::X509CertificateSchannel; } -QSsl::X509PemReaderPtr QSchannelBackend::X509PemReader() const +QTlsPrivate::X509PemReaderPtr QSchannelBackend::X509PemReader() const { - return QSsl::X509CertificateGeneric::certificatesFromPem; + return QTlsPrivate::X509CertificateGeneric::certificatesFromPem; } -QSsl::X509DerReaderPtr QSchannelBackend::X509DerReader() const +QTlsPrivate::X509DerReaderPtr QSchannelBackend::X509DerReader() const { - return QSsl::X509CertificateGeneric::certificatesFromDer; + return QTlsPrivate::X509CertificateGeneric::certificatesFromDer; } Q_GLOBAL_STATIC(QSchannelBackend, backend) @@ -630,7 +630,7 @@ QList QSslSocketPrivate::systemCaCertificates() PCCERT_CONTEXT pc = nullptr; while ((pc = CertFindCertificateInStore(hSystemStore.get(), X509_ASN_ENCODING, 0, CERT_FIND_ANY, nullptr, pc))) { - systemCerts.append(QSsl::X509CertificateSchannel::QSslCertificate_from_CERT_CONTEXT(pc)); + systemCerts.append(QTlsPrivate::X509CertificateSchannel::QSslCertificate_from_CERT_CONTEXT(pc)); } } return systemCerts; @@ -1991,7 +1991,7 @@ bool QSslSocketBackendPrivate::verifyCertContext(CERT_CONTEXT *certContext) return QSslCertificate(); const CERT_CONTEXT *certContext = element->pCertContext; - return QSsl::X509CertificateSchannel::QSslCertificate_from_CERT_CONTEXT(certContext); + return QTlsPrivate::X509CertificateSchannel::QSslCertificate_from_CERT_CONTEXT(certContext); }; // Pick a chain to use as the certificate chain, if multiple are available: -- cgit v1.2.3