Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev

libwvdrmengine/cdm/core/src/crypto_session.cpp

@@ -1483,6 +1483,13 @@ CdmResponseType CryptoSession::Decrypt(
   // Convert the pattern descriptor
   OEMCrypto_CENCEncryptPatternDesc oec_pattern{params.pattern.encrypt_blocks,
                                                params.pattern.skip_blocks};
+  // TODO(b/146581957): Remove this workaround once OEMCrypto treats (0,0) as
+  // 'cbcs' instead of 'cbc1'.
+  if (params.cipher_mode == kCipherModeCbc && oec_pattern.encrypt == 0 &&
+      oec_pattern.skip == 0) {
+    // (10, 0) is the preferred pattern for decrypting every block in 'cbcs'
+    oec_pattern.encrypt = 10;
+  }
 
   // Check if a key needs to be selected
   if (is_any_sample_protected) {

libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp

@@ -111,11 +111,6 @@ ssize_t WVCryptoPlugin::decrypt(bool secure, const uint8_t key[KEY_ID_SIZE],
     errorDetailMsg->setTo(
         "The 'cens' schema is not supported by Widevine CDM.");
     return kErrorUnsupportedCrypto;
-  } else if (mode == kMode_AES_CBC &&
-             (pattern.mEncryptBlocks == 0 && pattern.mSkipBlocks == 0)) {
-    errorDetailMsg->setTo(
-        "The 'cbc1' schema is not supported by Widevine CDM.");
-    return kErrorUnsupportedCrypto;
   }
 
   // Convert parameters to the form the CDM wishes to consume them in.

libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp

@@ -185,11 +185,6 @@ Return<void> WVCryptoPlugin::decrypt_1_2(
     _hidl_cb(Status_V1_2::BAD_VALUE, 0,
              "The 'cens' schema is not supported by Widevine CDM.");
     return Void();
-  } else if (mode == Mode::AES_CBC &&
-             (pattern.encryptBlocks == 0 && pattern.skipBlocks == 0)) {
-    _hidl_cb(Status_V1_2::BAD_VALUE, 0,
-             "The 'cbc1' schema is not supported by Widevine CDM.");
-    return Void();
   }
 
   // Convert parameters to the form the CDM wishes to consume them in.

libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp

@@ -339,7 +339,7 @@ TEST_F(WVCryptoPluginTest, AttemptsToDecrypt) {
             "WVCryptoPlugin reported a detailed error message.";
 }
 
-TEST_F(WVCryptoPluginTest, RejectsCensAndCbc1) {
+TEST_F(WVCryptoPluginTest, RejectsCens) {
   android::sp<StrictMock<MockCDM>> cdm = new StrictMock<MockCDM>();
 
   constexpr size_t kSubSampleCount = 2;
@@ -380,7 +380,6 @@ TEST_F(WVCryptoPluginTest, RejectsCensAndCbc1) {
       static_cast<void*>(destination->unsecurePointer()));
   ASSERT_NE(pDest, nullptr);
 
-  Pattern noPattern = { 0, 0 };
   Pattern recommendedPattern = { 1, 9 };
 
   // Provide the expected behavior for IsOpenSession
@@ -409,15 +408,6 @@ TEST_F(WVCryptoPluginTest, RejectsCensAndCbc1) {
         EXPECT_EQ(status, Status::BAD_VALUE);
         EXPECT_EQ(bytesWritten, 0);
       });
-
-  plugin.decrypt(
-      false, hidl_array<uint8_t, 16>(keyId), hidl_array<uint8_t, 16>(iv),
-      Mode::AES_CBC, noPattern, hSubSamples, sourceBuffer, 0, hDestination,
-      [&](Status status, uint32_t bytesWritten,
-          hidl_string /* errorDetailMessage */) {
-        EXPECT_EQ(status, Status::BAD_VALUE);
-        EXPECT_EQ(bytesWritten, 0);
-      });
 }
 
 TEST_F(WVCryptoPluginTest, CommunicatesSecureBufferRequest) {

libwvdrmengine/mediacrypto/test/legacy_src/WVCryptoPlugin_test.cpp

@@ -221,7 +221,7 @@ TEST_F(WVCryptoPluginTest, AttemptsToDecrypt) {
       "WVCryptoPlugin reported a detailed error message.";
 }
 
-TEST_F(WVCryptoPluginTest, RejectsCensAndCbc1) {
+TEST_F(WVCryptoPluginTest, RejectsCens) {
   android::sp<StrictMock<MockCDM>> cdm = new StrictMock<MockCDM>();
 
   constexpr size_t kSubSampleCount = 2;
@@ -244,7 +244,6 @@ TEST_F(WVCryptoPluginTest, RejectsCensAndCbc1) {
   fread(inputData, sizeof(uint8_t), kDataSize, fp);
   fclose(fp);
 
-  android::CryptoPlugin::Pattern noPattern = { 0, 0 };
   android::CryptoPlugin::Pattern recommendedPattern = { 1, 9 };
 
   // Provide the expected behavior for IsOpenSession
@@ -267,15 +266,6 @@ TEST_F(WVCryptoPluginTest, RejectsCensAndCbc1) {
       "WVCryptoPlugin did not return an error for 'cens'.";
   EXPECT_NE(errorDetailMessage.size(), 0u) <<
       "WVCryptoPlugin did not report a detailed error message for 'cens'.";
-
-  res = plugin.decrypt(false, keyId, iv, CryptoPlugin::kMode_AES_CBC,
-                       noPattern, inputData, subSamples, kSubSampleCount,
-                       outputData, &errorDetailMessage);
-
-  EXPECT_EQ(res, kErrorUnsupportedCrypto) <<
-      "WVCryptoPlugin did not return an error for 'cbc1'.";
-  EXPECT_NE(errorDetailMessage.size(), 0u) <<
-      "WVCryptoPlugin did not report a detailed error message for 'cbc1'.";
 }
 
 TEST_F(WVCryptoPluginTest, CommunicatesSecureBufferRequest) {