diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-19 11:34:40 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-20 11:37:24 +0000 |
commit | 933b542d36266627dd776b516459a5c1610555af (patch) | |
tree | 759b7db5a5e2968ac53874f8c61b6a4a2878808d /src/core/api | |
parent | f4e041643d5f05330e6495d83f2e583da97a69d7 (diff) |
Remove Entry type from QWebEngineClientCertificateStore
It is now only possible to list contained certificates, which is used
by the existing tests.
Change-Id: I3eada816a05cff2bb9cc5d39125136e9084a1a2f
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/api')
-rw-r--r-- | src/core/api/qwebengineclientcertificatestore.cpp | 16 | ||||
-rw-r--r-- | src/core/api/qwebengineclientcertificatestore.h | 10 |
2 files changed, 8 insertions, 18 deletions
diff --git a/src/core/api/qwebengineclientcertificatestore.cpp b/src/core/api/qwebengineclientcertificatestore.cpp index cac8fb151..854628b29 100644 --- a/src/core/api/qwebengineclientcertificatestore.cpp +++ b/src/core/api/qwebengineclientcertificatestore.cpp @@ -92,19 +92,15 @@ void QWebEngineClientCertificateStore::add(const QSslCertificate &certificate, c } /*! - Returns a list of private and public keys of client certificates in the in-memory store. - Returns an empty list if the in-memory store does not contain certificates. + Returns a list of the client certificates in the in-memory store. + Returns an empty list if the store does not contain any certificates. */ -QList<QWebEngineClientCertificateStore::Entry> QWebEngineClientCertificateStore::toList() const +QVector<QSslCertificate> QWebEngineClientCertificateStore::certificates() const { - QList<Entry> certificateList; - for (auto data : qAsConst(m_storeData->extraCerts)) { - Entry entry; - entry.certificate = data->certificate; - entry.privateKey = data->key; - certificateList.append(entry); - } + QVector<QSslCertificate> certificateList; + for (auto data : qAsConst(m_storeData->extraCerts)) + certificateList.append(data->certificate); return certificateList; } diff --git a/src/core/api/qwebengineclientcertificatestore.h b/src/core/api/qwebengineclientcertificatestore.h index 441a5f913..d9a1a0545 100644 --- a/src/core/api/qwebengineclientcertificatestore.h +++ b/src/core/api/qwebengineclientcertificatestore.h @@ -42,7 +42,7 @@ #include <QtWebEngineCore/qtwebenginecoreglobal.h> -#include <QtCore/qscopedpointer.h> +#include <QtCore/qvector.h> #include <QtNetwork/qsslcertificate.h> #include <QtNetwork/qsslkey.h> @@ -55,17 +55,11 @@ QT_BEGIN_NAMESPACE #if QT_CONFIG(ssl) -class QWebEngineProfile; class QWEBENGINECORE_EXPORT QWebEngineClientCertificateStore { public: - struct Entry { - QSslKey privateKey; - QSslCertificate certificate; - }; - void add(const QSslCertificate &certificate, const QSslKey &privateKey); - QList<Entry> toList() const; + QVector<QSslCertificate> certificates() const; void remove(const QSslCertificate &certificate); void clear(); |