diff options
author | Michal Klocek <michal.klocek@qt.io> | 2022-11-09 17:34:06 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2022-12-08 17:26:03 +0100 |
commit | 83bf8804474287b4ea802a8eee8735e5bee39c0d (patch) | |
tree | 80a34e0ec9f67173cf5d01ccdef6cdfbc808ba82 | |
parent | 8d66c76a01d5fbbdea501d902aa80449ccb799df (diff) |
Minor. Remove Override from client certificate store
Change 'Override" in favor of 'Qt' so it matches the rest
of the source base.
Change-Id: I0ba614ed3017a8d7e0ba5fc703b3f04c28b5ead7
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
(cherry picked from commit c52afb2206ccfa46b1a09ef7af2cb0ae210e3b79)
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/core/net/client_cert_qt.cpp (renamed from src/core/net/client_cert_override.cpp) | 28 | ||||
-rw-r--r-- | src/core/net/client_cert_qt.h (renamed from src/core/net/client_cert_override.h) | 10 | ||||
-rw-r--r-- | src/core/net/client_cert_store_data.cpp | 8 | ||||
-rw-r--r-- | src/core/profile_io_data_qt.cpp | 6 |
5 files changed, 27 insertions, 27 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 61bf707c9..dbeea777c 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -125,7 +125,7 @@ foreach(arch ${archs}) login_delegate_qt.cpp login_delegate_qt.h media_capture_devices_dispatcher.cpp media_capture_devices_dispatcher.h native_web_keyboard_event_qt.cpp - net/client_cert_override.cpp net/client_cert_override.h + net/client_cert_qt.cpp net/client_cert_qt.h net/client_cert_store_data.cpp net/client_cert_store_data.h net/cookie_monster_delegate_qt.cpp net/cookie_monster_delegate_qt.h net/custom_url_loader_factory.cpp net/custom_url_loader_factory.h diff --git a/src/core/net/client_cert_override.cpp b/src/core/net/client_cert_qt.cpp index d1946de5d..1e7aa8b6a 100644 --- a/src/core/net/client_cert_override.cpp +++ b/src/core/net/client_cert_qt.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#include "client_cert_override.h" +#include "client_cert_qt.h" #include "base/bind.h" #include "base/task/post_task.h" @@ -35,12 +35,12 @@ namespace { -class ClientCertIdentityOverride : public net::ClientCertIdentity +class ClientCertIdentityQt : public net::ClientCertIdentity { public: - ClientCertIdentityOverride(scoped_refptr<net::X509Certificate> cert, scoped_refptr<net::SSLPrivateKey> key) + ClientCertIdentityQt(scoped_refptr<net::X509Certificate> cert, scoped_refptr<net::SSLPrivateKey> key) : net::ClientCertIdentity(std::move(cert)), m_key(std::move(key)) {} - ~ClientCertIdentityOverride() override = default; + ~ClientCertIdentityQt() override = default; void AcquirePrivateKey(base::OnceCallback<void(scoped_refptr<net::SSLPrivateKey>)> private_key_callback) override { @@ -55,17 +55,17 @@ private: namespace QtWebEngineCore { -ClientCertOverrideStore::ClientCertOverrideStore(ClientCertificateStoreData *storeData) +ClientCertStoreQt::ClientCertStoreQt(ClientCertificateStoreData *storeData) : ClientCertStore() , m_storeData(storeData) , m_nativeStore(createNativeStore()) { } -ClientCertOverrideStore::~ClientCertOverrideStore() = default; +ClientCertStoreQt::~ClientCertStoreQt() = default; #if QT_CONFIG(ssl) -net::ClientCertIdentityList ClientCertOverrideStore::GetClientCertsOnUIThread(const net::SSLCertRequestInfo &cert_request_info) +net::ClientCertIdentityList ClientCertStoreQt::GetClientCertsOnUIThread(const net::SSLCertRequestInfo &cert_request_info) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); const auto &clientCertOverrideData = m_storeData->extraCerts; @@ -81,7 +81,7 @@ net::ClientCertIdentityList ClientCertOverrideStore::GetClientCertsOnUIThread(co } if (cert_request_info.cert_authorities.empty() || cert->IsIssuedByEncoded(cert_request_info.cert_authorities)) { - selected_identities.push_back(std::make_unique<ClientCertIdentityOverride>( + selected_identities.push_back(std::make_unique<ClientCertIdentityQt>( cert, clientCertOverrideData[i]->keyPtr)); } } @@ -89,14 +89,14 @@ net::ClientCertIdentityList ClientCertOverrideStore::GetClientCertsOnUIThread(co return selected_identities; } -void ClientCertOverrideStore::GetClientCertsReturn(const net::SSLCertRequestInfo &cert_request_info, +void ClientCertStoreQt::GetClientCertsReturn(const net::SSLCertRequestInfo &cert_request_info, ClientCertListCallback callback, net::ClientCertIdentityList &&result) { // Continue with native cert store and append them after memory certificates if (m_nativeStore) { ClientCertListCallback callback2 = base::BindOnce( - [](ClientCertOverrideStore::ClientCertListCallback callback, + [](ClientCertStoreQt::ClientCertListCallback callback, net::ClientCertIdentityList result1, net::ClientCertIdentityList result2) { while (!result2.empty()) { result1.push_back(std::move(result2.back())); @@ -113,16 +113,16 @@ void ClientCertOverrideStore::GetClientCertsReturn(const net::SSLCertRequestInfo #endif // QT_CONFIG(ssl) -void ClientCertOverrideStore::GetClientCerts(const net::SSLCertRequestInfo &cert_request_info, +void ClientCertStoreQt::GetClientCerts(const net::SSLCertRequestInfo &cert_request_info, ClientCertListCallback callback) { #if QT_CONFIG(ssl) // Access the user-provided data from the UI thread, but return on whatever thread this is. bool ok = base::PostTaskAndReplyWithResult( FROM_HERE, { content::BrowserThread::UI }, - base::BindOnce(&ClientCertOverrideStore::GetClientCertsOnUIThread, + base::BindOnce(&ClientCertStoreQt::GetClientCertsOnUIThread, base::Unretained(this), std::cref(cert_request_info)), - base::BindOnce(&ClientCertOverrideStore::GetClientCertsReturn, + base::BindOnce(&ClientCertStoreQt::GetClientCertsReturn, base::Unretained(this), std::cref(cert_request_info), std::move(callback))); DCHECK(ok); // callback is already moved and we can't really recover here. #else @@ -134,7 +134,7 @@ void ClientCertOverrideStore::GetClientCerts(const net::SSLCertRequestInfo &cert } // static -std::unique_ptr<net::ClientCertStore> ClientCertOverrideStore::createNativeStore() +std::unique_ptr<net::ClientCertStore> ClientCertStoreQt::createNativeStore() { #if BUILDFLAG(USE_NSS_CERTS) return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(net::ClientCertStoreNSS::PasswordDelegateFactory())); diff --git a/src/core/net/client_cert_override.h b/src/core/net/client_cert_qt.h index 6f740cc9c..85b0d28be 100644 --- a/src/core/net/client_cert_override.h +++ b/src/core/net/client_cert_qt.h @@ -1,8 +1,8 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef CLIENT_CERT_OVERRIDE_P_H -#define CLIENT_CERT_OVERRIDE_P_H +#ifndef CLIENT_CERT_QT_P_H +#define CLIENT_CERT_QT_P_H #include "net/ssl/client_cert_store.h" #include "base/callback_forward.h" @@ -15,11 +15,11 @@ class SSLCertRequestInfo; namespace QtWebEngineCore { struct ClientCertificateStoreData; -class ClientCertOverrideStore : public net::ClientCertStore +class ClientCertStoreQt : public net::ClientCertStore { public: - ClientCertOverrideStore(ClientCertificateStoreData *storeData); - virtual ~ClientCertOverrideStore() override; + ClientCertStoreQt(ClientCertificateStoreData *storeData); + virtual ~ClientCertStoreQt() override; void GetClientCerts(const net::SSLCertRequestInfo &cert_request_info, ClientCertListCallback callback) override; private: diff --git a/src/core/net/client_cert_store_data.cpp b/src/core/net/client_cert_store_data.cpp index 33ef6b5e9..306e782e0 100644 --- a/src/core/net/client_cert_store_data.cpp +++ b/src/core/net/client_cert_store_data.cpp @@ -20,16 +20,16 @@ namespace { -class SSLPlatformKeyOverride : public net::ThreadedSSLPrivateKey::Delegate +class SSLPlatformKeyQt : public net::ThreadedSSLPrivateKey::Delegate { public: - SSLPlatformKeyOverride(const QByteArray &sslKeyInBytes) + SSLPlatformKeyQt(const QByteArray &sslKeyInBytes) { m_mem = BIO_new_mem_buf(sslKeyInBytes, -1); m_key = PEM_read_bio_PrivateKey(m_mem, nullptr, nullptr, nullptr); } - ~SSLPlatformKeyOverride() override + ~SSLPlatformKeyQt() override { if (m_key) EVP_PKEY_free(m_key); @@ -82,7 +82,7 @@ scoped_refptr<net::SSLPrivateKey> wrapOpenSSLPrivateKey(const QByteArray &sslKey return nullptr; return base::MakeRefCounted<net::ThreadedSSLPrivateKey>( - std::make_unique<SSLPlatformKeyOverride>(sslKeyInBytes), + std::make_unique<SSLPlatformKeyQt>(sslKeyInBytes), net::GetSSLPlatformKeyTaskRunner()); } diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp index 7fd6163f2..cd381afc5 100644 --- a/src/core/profile_io_data_qt.cpp +++ b/src/core/profile_io_data_qt.cpp @@ -18,7 +18,7 @@ #include "services/network/public/cpp/cors/origin_access_list.h" #include "services/network/public/mojom/cert_verifier_service.mojom.h" -#include "net/client_cert_override.h" +#include "net/client_cert_qt.h" #include "net/client_cert_store_data.h" #include "net/cookie_monster_delegate_qt.h" #include "net/system_network_context_manager.h" @@ -185,9 +185,9 @@ ClientCertificateStoreData *ProfileIODataQt::clientCertificateStoreData() std::unique_ptr<net::ClientCertStore> ProfileIODataQt::CreateClientCertStore() { #if QT_CONFIG(ssl) - return std::unique_ptr<net::ClientCertStore>(new ClientCertOverrideStore(m_clientCertificateStoreData)); + return std::unique_ptr<net::ClientCertStore>(new ClientCertStoreQt(m_clientCertificateStoreData)); #else - return std::unique_ptr<net::ClientCertStore>(new ClientCertOverrideStore(nullptr)); + return std::unique_ptr<net::ClientCertStore>(new ClientCertStoreQt(nullptr)); #endif } |