diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-02-22 13:45:07 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-02 18:03:00 +0000 |
| commit | 79138e41d6bf9ca60056a5c7fe0f35f3b67a9237 (patch) | |
| tree | 9da7a367e4f0b6d5431d5bb342e6abeefe6b0048 /src/network/ssl/qsslcertificate.h | |
| parent | 49bed939b61ce4e15d927e62d7341bc7258c9d33 (diff) | |
Move QSslCertificate's details and cert-related code to the plugins
Also since we have to properly support 'no-ssl' configure option
(alas, we support QSslCertificate on such builds) - introduce
a minimal crippled QTlsBackendCertOnly, which depends on
X509CertificateGeneric.
Fixes: QTBUG-90954
Task-number: QTBUG-65922
Change-Id: Ib9d62903f16b7c0eaaa23e319a822c24a7631dc6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 41fc143635c25f937a557f09890601f6c7d38736)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/network/ssl/qsslcertificate.h')
| -rw-r--r-- | src/network/ssl/qsslcertificate.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index a2ba90465f..ea9c99adda 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -148,12 +148,7 @@ public: const QByteArray &data, QSsl::EncodingFormat format = QSsl::Pem); #ifndef QT_NO_SSL -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) static QList<QSslError> verify(const QList<QSslCertificate> &certificateChain, const QString &hostName = QString()); -#else - static QList<QSslError> verify(QList<QSslCertificate> certificateChain, const QString &hostName = QString()); -#endif - static bool importPkcs12(QIODevice *device, QSslKey *key, QSslCertificate *cert, QList<QSslCertificate> *caCertificates = nullptr, @@ -163,10 +158,7 @@ public: Qt::HANDLE handle() const; private: - QSsl::X509Certificate *backendImplementation() const - { - return nullptr; // TLSTODO - } + QSsl::X509Certificate *backendImplementation() const; QExplicitlySharedDataPointer<QSslCertificatePrivate> d; friend class QSslCertificatePrivate; friend class QSslSocketBackendPrivate; |