Temporarily use old test keybox
Merge from Widevine repo of http://go/wvgerrit/65922 This CL puts the old 4121 test keybox back into the unit and android integration tests so that we can run tests on a device with OEMCrypto v13. This change should not be released, and should not be included in CE CDM. It should be removed once we have more test devices with v14 or v15. Bug: 119313532 Bug: 119316243 Test: unit tests Test: tested as part of http://go/ag/5501993 Change-Id: If6a459e11176e07c66fbe6fc45c63d87595a20dc
This commit is contained in:
@@ -103,6 +103,8 @@ void SessionUtil::EnsureTestKeys() {
|
||||
switch (global_features.derive_key_method) {
|
||||
case DeviceFeatures::LOAD_TEST_KEYBOX:
|
||||
keybox_ = kTestKeybox;
|
||||
// TODO(fredgc, b/119316243): REMOVE FOLLOWING LINE:
|
||||
if (global_features.api_version < 14) keybox_ = kTestKeyboxForV13;
|
||||
ASSERT_EQ(OEMCrypto_SUCCESS,
|
||||
OEMCrypto_LoadTestKeybox(
|
||||
reinterpret_cast<const uint8_t*>(&keybox_),
|
||||
|
||||
Reference in New Issue
Block a user