Source release 14.1.0

core/src/license.cpp

@@ -1,4 +1,6 @@
-// Copyright 2012 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.
 
 #include "license.h"
 
@@ -78,9 +80,17 @@ static std::vector<CryptoKey> ExtractEntitlementKeys(const License& license) {
   // Extract sub session key(s)
   for (int i = 0; i < license.key_size(); ++i) {
     CryptoKey key;
+    size_t length = 0;
     switch (license.key(i).type()) {
       case License_KeyContainer::ENTITLEMENT: {
-        key.set_key_data(license.key(i).key());
+        // Strip off PKCS#5 padding - since we know the key is 32 or 48 bytes,
+        // the padding will always be 16 bytes.
+        if (license.key(i).key().size() > 32) {
+          length = license.key(i).key().size() - 16;
+        } else {
+          length = 0;
+        }
+        key.set_key_data(license.key(i).key().substr(0, length));
         key.set_key_data_iv(license.key(i).iv());
         key.set_key_id(license.key(i).id());
         key.set_track_label(license.key(i).track_label());
@@ -1148,7 +1158,6 @@ CdmResponseType CdmLicense::HandleNewEntitledKeys(
   CdmResponseType resp =
       crypto_session_->LoadEntitledContentKeys(entitled_key_array);
   if (KEY_ADDED == resp) {
-    loaded_keys_.clear();
     for (std::vector<WidevinePsshData_EntitledKey>::const_iterator it =
              wrapped_keys.begin();
          it != wrapped_keys.end(); ++it) {