Verify CDM host files #283
Conversation
darkdh
changed the title
|
mac is ok. working on windows |
patches/master_patch.patch
Outdated
| widevine_sign_file("sign_cdm_adapter_for_widevine") { | ||
| file = "$root_out_dir/$widevine_cdm_path/widevinecdmadapter.plugin" | ||
| + if (!muon_chromium_build) { | ||
| + signature_file = "$file.dummy" |
There was a problem hiding this comment.
I don't understand why this is necessary. You can pass the signature file in widevine_sign_file
There was a problem hiding this comment.
^^ we can create our own target instead of using chrome's
There was a problem hiding this comment.
That was meant for preventing duplicate output
There was a problem hiding this comment.
ERROR at //third_party/widevine/cdm/widevine.gni:15:3: Duplicate output file.
action(target_name) {
^--------------------
Two or more targets generate the same output:
WidevineCdm/_platform_specific/mac_x64/widevinecdmadapter.plugin.sig
This is can often be fixed by changing one of the target names, or by
setting an output_name on one of them.
Collisions:
//chrome:sign_cdm_adapter_for_widevine
//electron/app/mac:sign_cdm_adapter_for_widevine_on_brave
See //third_party/widevine/cdm/widevine.gni:15:3: Collision.
action(target_name) {
^--------------------
There was a problem hiding this comment.
so why is the signature file set to $file.dummy?
There was a problem hiding this comment.
can we just use all the same params as chrome?
There was a problem hiding this comment.
to make it different from WidevineCdm/_platform_specific/mac_x64/widevinecdmadapter.plugin.sig
cause we don't use it here. we have our own //electron/app/mac:sign_cdm_adapter_for_widevine_on_brave
patches/master_patch.patch
Outdated
| "$flags", | ||
| ] | ||
| + if (!muon_chromium_build) { | ||
| + args += [ |
There was a problem hiding this comment.
also confused by this one because there is no source here for signature_generator.py
There was a problem hiding this comment.
we can't disclose the script from widevine. For now, we have to do manually copy to the destination. Maybe we can use submit it to our private repo and pull it to the right place
| @@ -8,9 +8,57 @@ | |||
|
|
|||
| #include "base/strings/stringprintf.h" | |||
| #include "base/strings/string_util.h" | |||
| #include "content/public/common/cdm_info.h" | |||
There was a problem hiding this comment.
please move this to atom_content_client. Brightray is deprecated and we want to get rid of these classes
fix brave/browser-laptop#10449 Auditors: @bridiver, @bbondy, @bsclifton
darkdh
changed the title
atom/app/atom_content_client.cc
Outdated
| #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) | ||
| if (cdm_host_file_paths) { | ||
| #if defined(OS_WIN) | ||
| static const base::FilePath::CharType* const kUnversionedFiles[] = { |
There was a problem hiding this comment.
use base::FILE_EXE instead of hard-coding brave.exe with the path
| << ", signature_path=" << brave_framework_sig_path.value(); | ||
| cdm_host_file_paths->push_back( | ||
| content::CdmHostFilePath(brave_framework_path, brave_framework_sig_path)); | ||
| #endif |
There was a problem hiding this comment.
@posix4e you'll need something here for linux
fix brave/browser-laptop#10449
required https://github.com/brave/browser-laptop-bootstrap/pull/21Auditors: @bridiver, @bbondy, @bsclifton
To reviewers:
signature_generator.pyfrom widevine3. Copysignature_generator.pyinto//third_party/widevine/scripts/signature_generator.pybefore building withsign_widevine