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
2018-11-09 16:13:25 -08:00
parent c3772ebd0c
commit 458de2569d
6 changed files with 317 additions and 515 deletions
--- a/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
+++ b/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
@@ -110,9 +110,6 @@ void DeviceFeatures::Initialize(bool is_cast_receiver,
    case LOAD_TEST_RSA_KEY:
      printf("LOAD_TEST_RSA_KEY: Call LoadTestRSAKey before deriving keys.\n");
      break;
-    case EXISTING_TEST_KEYBOX:
-      printf("EXISTING_TEST_KEYBOX: Keybox is already the test keybox.\n");
-      break;
    case FORCE_TEST_KEYBOX:
      printf("FORCE_TEST_KEYBOX: User requested calling InstallKeybox.\n");
      break;
@@ -188,32 +185,12 @@ void DeviceFeatures::PickDerivedKey() {
    // If device uses a keybox, try to load the test keybox.
    if (OEMCrypto_ERROR_NOT_IMPLEMENTED != OEMCrypto_LoadTestKeybox(NULL, 0)) {
      derive_key_method = LOAD_TEST_KEYBOX;
-    } else if (IsTestKeyboxInstalled()) {
-      derive_key_method = EXISTING_TEST_KEYBOX;
    }
  } else if (OEMCrypto_ERROR_NOT_IMPLEMENTED != OEMCrypto_LoadTestRSAKey()) {
    derive_key_method = LOAD_TEST_RSA_KEY;
  }
 }

-bool DeviceFeatures::IsTestKeyboxInstalled() {
-  uint8_t key_data[256];
-  size_t key_data_len = sizeof(key_data);
-  if (OEMCrypto_GetKeyData(key_data, &key_data_len) != OEMCrypto_SUCCESS)
-    return false;
-  if (key_data_len != sizeof(kValidKeybox01.data_)) return false;
-  if (memcmp(key_data, kValidKeybox01.data_, key_data_len)) return false;
-  uint8_t dev_id[128] = {0};
-  size_t dev_id_len = 128;
-  if (OEMCrypto_GetDeviceID(dev_id, &dev_id_len) != OEMCrypto_SUCCESS)
-    return false;
-  // We use strncmp instead of memcmp because we don't really care about the
-  // multiple '\0' characters at the end of the device id.
-  return 0 == strncmp(reinterpret_cast<const char*>(dev_id),
-                      reinterpret_cast<const char*>(kValidKeybox01.device_id_),
-                      sizeof(kValidKeybox01.device_id_));
-}
-
 void DeviceFeatures::FilterOut(std::string* current_filter,
                               const std::string& new_filter) {
  if (current_filter->find('-') == std::string::npos) {
--- a/libwvdrmengine/oemcrypto/test/oec_device_features.h
+++ b/libwvdrmengine/oemcrypto/test/oec_device_features.h
@@ -14,7 +14,6 @@ class DeviceFeatures {
    NO_METHOD,             // Cannot derive known session keys.
    LOAD_TEST_KEYBOX,      // Call LoadTestKeybox before deriving keys.
    LOAD_TEST_RSA_KEY,     // Call LoadTestRSAKey before deriving keys.
-    EXISTING_TEST_KEYBOX,  // Keybox is already the test keybox.
    FORCE_TEST_KEYBOX,     // User requested calling InstallKeybox.
    TEST_PROVISION_30,     // Device has OEM Certificate installed.
  };
--- a/libwvdrmengine/oemcrypto/test/oec_test_data.h
+++ b/libwvdrmengine/oemcrypto/test/oec_test_data.h
@@ -15,13 +15,10 @@

 namespace wvoec {

-// These are test keyboxes.  They will not be accepted by production systems.
+// This is a test keybox.  They will not be accepted by production systems.
 // By using known keyboxes for these tests, the results for a given set of
 // inputs to a test are predictable and can be compared to the actual results.
-// The first keybox, kTestKeybox, with deviceID "TestKey01" is used for most of
-// the tests.  It should be loaded by OEMCrypto when OEMCrypto_LoadTestKeybox
-// is called.
-static const wvoec::WidevineKeybox kTestKeybox = {
+static const WidevineKeybox kTestKeybox = {
  // Sample keybox used for test vectors
  {
    // deviceID = WidevineTestOnlyKeybox000
@@ -34,7 +31,7 @@ static const wvoec::WidevineKeybox kTestKeybox = {
    0xe4, 0xff, 0x57, 0x4c, 0x32, 0x2e, 0xf5, 0x34,
    0x26, 0x21, 0x2c, 0xb3, 0xed, 0x37, 0xf3, 0x5e,
  }, {
-    // data (system ID 7912).
+    // data (system ID 7912 = 1EE8).
    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x1e, 0xe8,
    0xca, 0x1e, 0x71, 0x7c, 0xfb, 0xe8, 0xa3, 0x94,
    0x52, 0x0a, 0x6b, 0x71, 0x37, 0xd2, 0x69, 0xfa,
@@ -53,105 +50,6 @@ static const wvoec::WidevineKeybox kTestKeybox = {
  }
 };

-// These are old test keyboxes.  The first keybox can be used to update an
-// older OEMCrypto because it is the same keybox that was previously used in
-// unit tests.
-static const wvoec::WidevineKeybox kValidKeybox01 = {
-  // Sample keybox used for test vectors
-  {
-    // deviceID
-    0x54, 0x65, 0x73, 0x74, 0x4b, 0x65, 0x79, 0x30,  // TestKey01
-    0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // ........
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // ........
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // ........
-  }, {
-    // key
-    0xfb, 0xda, 0x04, 0x89, 0xa1, 0x58, 0x16, 0x0e,
-    0xa4, 0x02, 0xe9, 0x29, 0xe3, 0xb6, 0x8f, 0x04,
-  }, {
-    // data
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x10, 0x19,
-    0x07, 0xd9, 0xff, 0xde, 0x13, 0xaa, 0x95, 0xc1,
-    0x22, 0x67, 0x80, 0x53, 0x36, 0x21, 0x36, 0xbd,
-    0xf8, 0x40, 0x8f, 0x82, 0x76, 0xe4, 0xc2, 0xd8,
-    0x7e, 0xc5, 0x2b, 0x61, 0xaa, 0x1b, 0x9f, 0x64,
-    0x6e, 0x58, 0x73, 0x49, 0x30, 0xac, 0xeb, 0xe8,
-    0x99, 0xb3, 0xe4, 0x64, 0x18, 0x9a, 0x14, 0xa8,
-    0x72, 0x02, 0xfb, 0x02, 0x57, 0x4e, 0x70, 0x64,
-    0x0b, 0xd2, 0x2e, 0xf4, 0x4b, 0x2d, 0x7e, 0x39,
-  }, {
-    // magic
-    0x6b, 0x62, 0x6f, 0x78,
-  }, {
-    // Crc
-    0x0a, 0x7a, 0x2c, 0x35,
-  }
-};
-
-static const wvoec::WidevineKeybox kValidKeybox02 = {
-  // Sample keybox used for test vectors
-  {
-    // deviceID
-    0x54, 0x65, 0x73, 0x74, 0x4b, 0x65, 0x79, 0x30, // TestKey02
-    0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
-  }, {
-    // key
-    0x76, 0x5d, 0xce, 0x01, 0x04, 0x89, 0xb3, 0xd0,
-    0xdf, 0xce, 0x54, 0x8a, 0x49, 0xda, 0xdc, 0xb6,
-  }, {
-    // data
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x10, 0x19,
-    0x92, 0x27, 0x0b, 0x1f, 0x1a, 0xd5, 0xc6, 0x93,
-    0x19, 0x3f, 0xaa, 0x74, 0x1f, 0xdd, 0x5f, 0xb4,
-    0xe9, 0x40, 0x2f, 0x34, 0xa4, 0x92, 0xf4, 0xae,
-    0x9a, 0x52, 0x39, 0xbc, 0xb7, 0x24, 0x38, 0x13,
-    0xab, 0xf4, 0x92, 0x96, 0xc4, 0x81, 0x60, 0x33,
-    0xd8, 0xb8, 0x09, 0xc7, 0x55, 0x0e, 0x12, 0xfa,
-    0xa8, 0x98, 0x62, 0x8a, 0xec, 0xea, 0x74, 0x8a,
-    0x4b, 0xfa, 0x5a, 0x9e, 0xb6, 0x49, 0x0d, 0x80,
-  }, {
-    // magic
-    0x6b, 0x62, 0x6f, 0x78,
-  }, {
-    // Crc
-    0x2a, 0x3b, 0x3e, 0xe4,
-  }
-};
-
-static const wvoec::WidevineKeybox kValidKeybox03 = {
-  // Sample keybox used for test vectors
-  {
-    // deviceID
-    0x54, 0x65, 0x73, 0x74, 0x4b, 0x65, 0x79, 0x30, // TestKey03
-    0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
-  }, {
-    // key
-    0x25, 0xe5, 0x2a, 0x02, 0x29, 0x68, 0x04, 0xa2,
-    0x92, 0xfd, 0x7c, 0x67, 0x0b, 0x67, 0x1f, 0x31,
-  }, {
-    // data
-    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x10, 0x19,
-    0xf4, 0x0a, 0x0e, 0xa2, 0x0a, 0x71, 0xd5, 0x92,
-    0xfa, 0xa3, 0x25, 0xc6, 0x4b, 0x76, 0xf1, 0x64,
-    0xf4, 0x60, 0xa0, 0x30, 0x72, 0x23, 0xbe, 0x03,
-    0xcd, 0xde, 0x7a, 0x06, 0xd4, 0x01, 0xeb, 0xdc,
-    0xe0, 0x50, 0xc0, 0x53, 0x0a, 0x50, 0xb0, 0x37,
-    0xe5, 0x05, 0x25, 0x0e, 0xa4, 0xc8, 0x5a, 0xff,
-    0x46, 0x6e, 0xa5, 0x31, 0xf3, 0xdd, 0x94, 0xb7,
-    0xe0, 0xd3, 0xf9, 0x04, 0xb2, 0x54, 0xb1, 0x64,
-  }, {
-    // magic
-    0x6b, 0x62, 0x6f, 0x78,
-  }, {
-    // Crc
-    0xa1, 0x99, 0x5f, 0x46,
-  }
-};
-
 // A 2048 bit RSA key in PKCS#8 PrivateKeyInfo format
 // Used to verify the functions that manipulate RSA keys.
 static const uint8_t kTestRSAPKCS8PrivateKeyInfo2_2048[] = {
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_session_tests_helper.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_session_tests_helper.cpp
@@ -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);
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -693,23 +693,18 @@ TEST_F(OEMCryptoSessionTestKeyboxTest, GoodForceKeybox) {
  ASSERT_EQ(DeviceFeatures::FORCE_TEST_KEYBOX,
            global_features.derive_key_method)
      << "ForceKeybox tests will modify the installed keybox.";
-  wvoec::WidevineKeybox keybox = kValidKeybox02;
+  wvoec::WidevineKeybox keybox = kTestKeybox;
  OEMCryptoResult sts;
  InstallKeybox(keybox, true);
  sts = OEMCrypto_IsKeyboxValid();
  ASSERT_EQ(OEMCrypto_SUCCESS, sts);
-
-  keybox = kValidKeybox03;
-  InstallKeybox(keybox, true);
-  sts = OEMCrypto_IsKeyboxValid();
-  ASSERT_EQ(OEMCrypto_SUCCESS, sts);
 }

 TEST_F(OEMCryptoSessionTestKeyboxTest, BadCRCForceKeybox) {
  ASSERT_EQ(DeviceFeatures::FORCE_TEST_KEYBOX,
            global_features.derive_key_method)
      << "ForceKeybox tests will modify the installed keybox.";
-  wvoec::WidevineKeybox keybox = kValidKeybox02;
+  wvoec::WidevineKeybox keybox = kTestKeybox;
  keybox.crc_[1] ^= 42;
  OEMCryptoResult sts;
  InstallKeybox(keybox, false);
@@ -721,7 +716,7 @@ TEST_F(OEMCryptoSessionTestKeyboxTest, BadMagicForceKeybox) {
  ASSERT_EQ(DeviceFeatures::FORCE_TEST_KEYBOX,
            global_features.derive_key_method)
      << "ForceKeybox tests will modify the installed keybox.";
-  wvoec::WidevineKeybox keybox = kValidKeybox02;
+  wvoec::WidevineKeybox keybox = kTestKeybox;
  keybox.magic_[1] ^= 42;
  OEMCryptoResult sts;
  InstallKeybox(keybox, false);
@@ -733,7 +728,7 @@ TEST_F(OEMCryptoSessionTestKeyboxTest, BadDataForceKeybox) {
  ASSERT_EQ(DeviceFeatures::FORCE_TEST_KEYBOX,
            global_features.derive_key_method)
      << "ForceKeybox tests will modify the installed keybox.";
-  wvoec::WidevineKeybox keybox = kValidKeybox02;
+  wvoec::WidevineKeybox keybox = kTestKeybox;
  keybox.data_[1] ^= 42;
  OEMCryptoResult sts;
  InstallKeybox(keybox, false);