Skip to content

[Keybox] Added handling of wv keybox #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pwielders merged 2 commits into from
Jun 22, 2020
+7 −0
Merged

[Keybox] Added handling of wv keybox #6

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76ff412
[Keybox] Added handling of wv keybox
Jun 17, 2020
058a534
[Keybox] Adjusted the keybox env var
Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions MediaSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,18 @@ class WideVine : public IMediaKeys, public widevine::Cdm::IEventListener
Config()
: Core::JSON::Container()
, Certificate()
, Keybox()
{
Add(_T("certificate"), &Certificate);
Add(_T("keybox"), &Keybox);
}
~Config()
{
}

public:
Core::JSON::String Certificate;
Core::JSON::String Keybox;
};

public:
Expand Down Expand Up @@ -117,6 +120,10 @@ class WideVine : public IMediaKeys, public widevine::Cdm::IEventListener
Config config;
config.FromString(configline);

if (config.Keybox.IsSet() == true) {
Core::SystemInfo::SetEnvironment("WIDEVINE_TEST_KEYBOX_PATH", config.Keybox.Value().c_str());
Comment thread
krplata marked this conversation as resolved.
Outdated
}

if (config.Certificate.IsSet() == true) {
Core::DataElementFile dataBuffer(config.Certificate.Value(), Core::File::USER_READ);

Expand Down