Update copyright notice and fix entitlement key sizes

This change updates the copyright notice to make it more clear that
the code is distribued under the Widevine Master License Agreement.

It also updates the unit tests and sample code to correct the useage
of AES 256.  AES 256 is used to decrypt entitled content keys, but it
is not used to decrypt key control blocks.

test/oec_device_features.cpp

@@ -1,4 +1,6 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 // OEMCrypto device features for unit tests
 //
@@ -186,8 +188,8 @@ bool DeviceFeatures::IsTestKeyboxInstalled() {
   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(kTestKeybox.data_)) return false;
-  if (memcmp(key_data, kTestKeybox.data_, key_data_len)) 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)
@@ -195,8 +197,8 @@ bool DeviceFeatures::IsTestKeyboxInstalled() {
   // 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*>(kTestKeybox.device_id_),
-                      sizeof(kTestKeybox.device_id_));
+                      reinterpret_cast<const char*>(kValidKeybox01.device_id_),
+                      sizeof(kValidKeybox01.device_id_));
 }
 
 void DeviceFeatures::FilterOut(std::string* current_filter,

test/oec_session_util.cpp

@@ -1,4 +1,6 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 // OEMCrypto unit tests
 //
@@ -105,8 +107,9 @@ Session::Session()
       enc_key_(wvcdm::KEY_SIZE),
       public_rsa_(0),
       message_size_(sizeof(MessageData)),
-      num_keys_(4) {  // Most tests only use 4 keys.
-                      // Other tests will explicitly call set_num_keys.
+      num_keys_(4),  // Most tests only use 4 keys.
+      // Other tests will explicitly call set_num_keys.
+      has_entitlement_license_(false) {
   // Stripe the padded message.
   for (size_t i = 0; i < sizeof(padded_message_.padding); i++) {
     padded_message_.padding[i] = i % 0x100;
@@ -310,6 +313,7 @@ void Session::LoadEnitlementTestKeys(const std::string& pst,
 }
 
 void Session::FillEntitledKeyArray() {
+  has_entitlement_license_ = true;
   for (size_t i = 0; i < num_keys_; ++i) {
     EntitledContentKeyData* key_data = &entitled_key_data_[i];
 
@@ -594,10 +598,10 @@ void Session::EncryptAndSign() {
   AES_cbc_encrypt(&license_.mac_keys[0], &encrypted_license().mac_keys[0],
                   2 * wvcdm::MAC_KEY_SIZE, &aes_key, iv_buffer, AES_ENCRYPT);
 
+  int key_size = has_entitlement_license() ? 256 : 128;
   for (unsigned int i = 0; i < num_keys_; i++) {
     memcpy(iv_buffer, &license_.keys[i].control_iv[0], wvcdm::KEY_IV_SIZE);
-    AES_set_encrypt_key(&license_.keys[i].key_data[0],
-                        license_.keys[i].key_data_length * 8, &aes_key);
+    AES_set_encrypt_key(&license_.keys[i].key_data[0], key_size, &aes_key);
     AES_cbc_encrypt(
         reinterpret_cast<const uint8_t*>(&license_.keys[i].control),
         reinterpret_cast<uint8_t*>(&encrypted_license().keys[i].control),

test/oec_session_util.h

@@ -1,7 +1,9 @@
 #ifndef CDM_OEC_SESSION_UTIL_H_
 #define CDM_OEC_SESSION_UTIL_H_
 
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 // OEMCrypto unit tests
 //
@@ -370,6 +372,9 @@ class Session {
   // The size of the encrypted message.
   size_t message_size() { return message_size_; }
 
+  // If this session has an entitlement license.
+  bool has_entitlement_license() const { return has_entitlement_license_; }
+
  private:
   // Generate mac and enc keys give the master key.
   void DeriveKeys(const uint8_t* master_key,
@@ -399,6 +404,7 @@ class Session {
   vector<uint8_t> encrypted_usage_entry_;
   uint32_t usage_entry_number_;
   string pst_;
+  bool has_entitlement_license_;
 
   // Clear Entitlement key data. This is the backing data for
   // |entitled_key_array_|.

test/oec_test_data.h

@@ -1,4 +1,6 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 // Test data for OEMCrypto unit tests.
 //

test/oemcrypto_session_tests_helper.cpp

@@ -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;

test/oemcrypto_test.cpp

@@ -1,4 +1,6 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 // OEMCrypto unit tests
 //
@@ -828,7 +830,7 @@ TEST_F(OEMCryptoSessionTests, LoadKeyWithNoMAC) {
   ASSERT_EQ(expected_signature, signature);
 }
 
-TEST_F(OEMCryptoSessionTests, LoadEntitlementKeys) {
+TEST_F(OEMCryptoSessionTests, LoadEntitlementKeysAPI14) {
   Session s;
   ASSERT_NO_FATAL_FAILURE(s.open());
   ASSERT_NO_FATAL_FAILURE(InstallTestSessionKeys(&s));
@@ -841,7 +843,7 @@ TEST_F(OEMCryptoSessionTests, LoadEntitlementKeys) {
   ASSERT_NO_FATAL_FAILURE(s.LoadEntitledContentKeys());
 }
 
-TEST_F(OEMCryptoSessionTests, LoadEntitlementKeysNoEntitlementKeys) {
+TEST_F(OEMCryptoSessionTests, LoadEntitlementKeysNoEntitlementKeysAPI14) {
   Session s;
   ASSERT_NO_FATAL_FAILURE(s.open());
   ASSERT_NO_FATAL_FAILURE(InstallTestSessionKeys(&s));

test/oemcrypto_test_android.cpp

@@ -1,4 +1,6 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 // OEMCrypto unit tests - extra tests required for Android platform.
 //