Fix backwards compatibility
Merge from Widevine repo of http://go/wvgerrit/42403 This CL changes the names of some unit tests so that they don't run when testing an older version of oemcrypto. bug: 68275290 test: ran unit tests against v8-v14 oemcrypto. Change-Id: I773350adf4df3f3b310478400cd4d4e85789fc37
This commit is contained in:
@@ -104,10 +104,10 @@ void SessionUtil::EnsureTestKeys() {
|
||||
case DeviceFeatures::LOAD_TEST_KEYBOX:
|
||||
keybox_ = kTestKeybox;
|
||||
/* Note: If you are upgrading from an older version, it may be easier to
|
||||
* uncomment the following line. This uses the same test keybox as we
|
||||
* force the following condition. This uses the same test keybox as we
|
||||
* used in older versions of this test.
|
||||
*/
|
||||
// keybox_ = kValidKeybox01;
|
||||
if (global_features.api_version < 14) keybox_ = kValidKeybox01;
|
||||
ASSERT_EQ(OEMCrypto_SUCCESS,
|
||||
OEMCrypto_LoadTestKeybox(
|
||||
reinterpret_cast<const uint8_t*>(&keybox_),
|
||||
@@ -117,8 +117,8 @@ void SessionUtil::EnsureTestKeys() {
|
||||
ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_LoadTestRSAKey());
|
||||
break;
|
||||
case DeviceFeatures::EXISTING_TEST_KEYBOX:
|
||||
// already has test keybox.
|
||||
keybox_ = kTestKeybox;
|
||||
// already has old test keybox.
|
||||
keybox_ = kValidKeybox01;
|
||||
break;
|
||||
case DeviceFeatures::FORCE_TEST_KEYBOX:
|
||||
keybox_ = kTestKeybox;
|
||||
|
||||
Reference in New Issue
Block a user