Remove old test cert and rest of 4121
Merge from Widevine repo of http://go/wvgerrit/62782 There were still some old test keyboxes in the unit tests for older devices and in the mod mock. These are removed. Also, the cert with system id 7346 has been removed. The new test keybox has system ID 7912. The new test cert has system id 7913. bug: 76435251 Test: unit tests (unit tests do not pass on v13 oemcrypto) Test: tested as part of http://go/ag/5501993 Change-Id: I6007b6650162d9dc9d01384faaafc87acdf8ebd7
This commit is contained in:
@@ -103,11 +103,6 @@ void SessionUtil::EnsureTestKeys() {
|
||||
switch (global_features.derive_key_method) {
|
||||
case DeviceFeatures::LOAD_TEST_KEYBOX:
|
||||
keybox_ = kTestKeybox;
|
||||
/* Note: If you are upgrading from an older version, it may be easier to
|
||||
* force the following condition. This uses the same test keybox as we
|
||||
* used in older versions of this test.
|
||||
*/
|
||||
if (global_features.api_version < 14) keybox_ = kValidKeybox01;
|
||||
ASSERT_EQ(OEMCrypto_SUCCESS,
|
||||
OEMCrypto_LoadTestKeybox(
|
||||
reinterpret_cast<const uint8_t*>(&keybox_),
|
||||
@@ -116,10 +111,6 @@ void SessionUtil::EnsureTestKeys() {
|
||||
case DeviceFeatures::LOAD_TEST_RSA_KEY:
|
||||
ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_LoadTestRSAKey());
|
||||
break;
|
||||
case DeviceFeatures::EXISTING_TEST_KEYBOX:
|
||||
// already has old test keybox.
|
||||
keybox_ = kValidKeybox01;
|
||||
break;
|
||||
case DeviceFeatures::FORCE_TEST_KEYBOX:
|
||||
keybox_ = kTestKeybox;
|
||||
InstallKeybox(keybox_, true);
|
||||
|
||||
Reference in New Issue
Block a user