Merge "Part of Qualcomm L1 OEMCrypto integration" into jb-mr2-dev

libwvdrmengine/cdm/core/src/crypto_session.cpp

@@ -161,7 +161,7 @@ void CryptoSession::GenerateMacContext(const std::string& input_context,
   deriv_context->assign(kSigningKeyLabel);
   deriv_context->append(1, '\0');
   deriv_context->append(input_context);
-  deriv_context->append(EncodeUint32(kSigningKeySizeBits));
+  deriv_context->append(EncodeUint32(kSigningKeySizeBits*2));
 }
 
 void CryptoSession::GenerateEncryptContext(const std::string& input_context,
@@ -419,10 +419,15 @@ CdmResponseType CryptoSession::Decrypt(bool is_encrypted,
       break;
   }
 
-  OEMCryptoResult sts = OEMCrypto_DecryptCTR(oec_session_id_, encrypt_buffer,
-                                             encrypt_length, is_encrypted,
-                                             &iv[0], block_offset,
-                                             &buffer_descriptor);
+  OEMCryptoResult sts = OEMCrypto_DecryptCTR(
+      oec_session_id_,
+      encrypt_buffer,
+      encrypt_length,
+      is_encrypted,
+      &iv[0],
+      block_offset,
+      &buffer_descriptor,
+      OEMCrypto_FirstSubsample | OEMCrypto_LastSubsample);
 
   if (OEMCrypto_SUCCESS != sts) {
     return UNKNOWN_ERROR;

libwvdrmengine/cdm/core/src/license.cpp

@@ -31,30 +31,31 @@ using video_widevine_server::sdk::ClientIdentification_NameValue;
 using video_widevine_server::sdk::LicenseRequest;
 using video_widevine_server::sdk::LicenseRequest_ContentIdentification;
 using video_widevine_server::sdk::LicenseRequest_ContentIdentification_CENC;
+using video_widevine_server::sdk::LicenseRequest_ContentIdentification_ExistingLicense;
 using video_widevine_server::sdk::License;
 using video_widevine_server::sdk::License_KeyContainer;
 using video_widevine_server::sdk::LicenseError;
 using video_widevine_server::sdk::SignedMessage;
 using video_widevine_server::sdk::STREAMING;
-using video_widevine_server::sdk::LicenseRequest_ContentIdentification_ExistingLicense;
+using video_widevine_server::sdk::VERSION_2_1;
+
 
 static std::vector<CryptoKey> ExtractContentKeys(const License& license) {
   std::vector<CryptoKey> key_array;
 
   // Extract content key(s)
   for (int i = 0; i < license.key_size(); ++i) {
-    // TODO(kqyang): Key ID size is not fixed in spec, but conventionally we
-    // always use 16 bytes key id. We'll need to update oemcrypto to support
-    // variable size key id.
-    if (license.key(i).id().size() == KEY_ID_SIZE &&
-        license.key(i).key().size() == KEY_SIZE + KEY_PAD_SIZE &&
-        license.key(i).type() == License_KeyContainer::CONTENT) {
-
+    // TODO(fredgc): Figure out what key.type is for Generic Keys.
+    // If the generic signing key is CONTENT, then the extra size log below is good.
+    // If it is SIGNING, then we are ignoring it. -- we should fix that by adding
+    // an else clause to this if statement.
+    if (license.key(i).type() == License_KeyContainer::CONTENT) {
       CryptoKey key;
       key.set_key_id(license.key(i).id());
-      // Strip off PKCS#5 padding
-      key.set_key_data(
-          license.key(i).key().substr(0, KEY_SIZE));
+      // Strip off PKCS#5 padding - since we know the key is 16 or 32 bytes, the
+      // padding will always be 16 bytes.
+      size_t length = license.key(i).key().size() - 16;
+      key.set_key_data( license.key(i).key().substr(0, length));
       key.set_key_data_iv(license.key(i).iv());
       if (license.key(i).has_key_control()) {
         key.set_key_control(
@@ -184,6 +185,7 @@ bool CdmLicense::PrepareKeyRequest(const CdmInitData& init_data,
   }
   license_request.set_key_control_nonce(UintToString(nonce));
   LOGD("PrepareKeyRequest: nonce=%u", nonce);
+  license_request.set_protocol_version(VERSION_2_1);
 
   // License request is complete. Serialize it.
   std::string serialized_license_req;
@@ -240,6 +242,7 @@ bool CdmLicense::PrepareKeyRenewalRequest(CdmKeyMessage* signed_request) {
   }
   license_request.set_key_control_nonce(UintToString(nonce));
   LOGD("PrepareKeyRenewalRequest: nonce=%u", nonce);
+  license_request.set_protocol_version(VERSION_2_1);
 
   // License request is complete. Serialize it.
   std::string serialized_license_req;

libwvdrmengine/cdm/test/request_license_test.cpp

@@ -545,7 +545,7 @@ TEST_F(WvCdmRequestLicenseTest, PartialBlockWithOffsetDecryptionTest) {
                                          0));
 
   EXPECT_TRUE(std::equal(data.decrypt_data.begin(), data.decrypt_data.end(),
-      decrypt_buffer.begin()));
+                         decrypt_buffer.begin()));
 
   decryptor_.CloseSession(session_id_);
 }