diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-06-10 12:25:58 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-06-10 14:35:02 +0000 |
| commit | d686675960c547425140583f3e933b07e96696f9 (patch) | |
| tree | 30be6d8eb55ee525bc3965bf80531b4ed4582005 | |
| parent | e7c84adad1b01719c076261aeb2ef01d24cede6d (diff) | |
| download | qtwebengine-chromium-d686675960c547425140583f3e933b07e96696f9.tar.gz | |
[Backport] CVE-2020-6493
Do not compile web authentication.
Chromium security bug 1082105
Change-Id: I0c4b01f89fef18bd3949eaa7b43d045f162216e6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/content/browser/BUILD.gn | 16 | ||||
| -rw-r--r-- | chromium/content/browser/frame_host/render_frame_host_impl.cc | 4 | ||||
| -rw-r--r-- | chromium/content/browser/frame_host/render_frame_host_impl.h | 2 |
3 files changed, 19 insertions, 3 deletions
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn index e8c82080993..e1c008f92bd 100644 --- a/chromium/content/browser/BUILD.gn +++ b/chromium/content/browser/BUILD.gn @@ -2498,6 +2498,22 @@ jumbo_source_set("browser") { ] } } + if (use_qt) { + sources -= [ + "webauth/authenticator_impl.cc", + "webauth/authenticator_impl.h", + "webauth/authenticator_type_converters.cc", + "webauth/authenticator_type_converters.h", + "webauth/scoped_virtual_authenticator_environment.cc", + "webauth/scoped_virtual_authenticator_environment.h", + "webauth/virtual_authenticator.cc", + "webauth/virtual_authenticator.h", + "webauth/virtual_discovery.cc", + "webauth/virtual_discovery.h", + ] + deps -= ["//device/fido"] + } + } buildflag_header("accessibility_buildflags") { diff --git a/chromium/content/browser/frame_host/render_frame_host_impl.cc b/chromium/content/browser/frame_host/render_frame_host_impl.cc index 80e6489492c..b703cc47a6d 100644 --- a/chromium/content/browser/frame_host/render_frame_host_impl.cc +++ b/chromium/content/browser/frame_host/render_frame_host_impl.cc @@ -3487,7 +3487,7 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { registry_->AddInterface(base::Bind(&ImageCaptureImpl::Create)); -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT) if (base::FeatureList::IsEnabled(features::kWebAuth)) { registry_->AddInterface( base::Bind(&RenderFrameHostImpl::BindAuthenticatorRequest, @@ -4965,7 +4965,7 @@ void RenderFrameHostImpl::BindPresentationServiceRequest( presentation_service_->Bind(std::move(request)); } -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT) void RenderFrameHostImpl::BindAuthenticatorRequest( blink::mojom::AuthenticatorRequest request) { if (!authenticator_impl_) diff --git a/chromium/content/browser/frame_host/render_frame_host_impl.h b/chromium/content/browser/frame_host/render_frame_host_impl.h index 127f9abe6a8..80a2c439105 100644 --- a/chromium/content/browser/frame_host/render_frame_host_impl.h +++ b/chromium/content/browser/frame_host/render_frame_host_impl.h @@ -1115,7 +1115,7 @@ class CONTENT_EXPORT RenderFrameHostImpl void BindPresentationServiceRequest( blink::mojom::PresentationServiceRequest request); -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT) void BindAuthenticatorRequest(blink::mojom::AuthenticatorRequest request); #endif |