From a674c7cdd03d13077710e8a21a608bda7a40a226 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Wed, 14 Apr 2021 02:57:50 -0700 Subject: [PATCH] Correct request_license_test failures [ Merge of http://go/wvgerrit/122103 ] When in CTR mode an encryption pattern should no longer be specified. This will address failures in Cdm/WvCenc30Test.DecryptionTest/* and Cdm/WvCenc30SwitchCipherModeTest.DecryptionTest/* Bug: 181693982 Test: WV unit/integration tests Change-Id: Iecbf28b51115501439aebf057056657c796896ae --- .../cdm/test/request_license_test.cpp | 56 ++++++++----------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index e8dff3e5..6dca6019 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -1384,14 +1384,14 @@ Cenc30SampleInfo kCenc30CencKey33Sample = { wvcdm::a2bs_hex("30303030303030303030303030303033"), wvcdm::a2bs_hex("9FBE45DD47DA7EBA09A3E24CBA95C9AF"), wvcdm::a2bs_hex( - "011E88387D58EBB8E5CDCC38D431EEF4B6094B9201F200932F8EB5E1A94FB0B977" - "FAB8DFDAD57C677E279615F4EAFA872CA8EFF83179E4DE2AB78E6B41A860C42203" - "4B875AC282406E03AC01F2E407A55DE38C6C35707F34B3319646FA016A01CE9056" - "E55D28C48ED72F10FA6625656ED62B758CBADA757DDC52533C9CBD54FC1A46F827" - "CC7B69BA66AE19A15D725FCBB972B23C83F95C0F00F481A7C9AC868701CB8BE038" - "15BBFFB95FD3A86F142127720A35234070799173B37219127141922CBA8CB2DC48" - "EC2477832D1AE477942DCDA93C0886AF72D71E56DA3D7737E49670B024639A195B" - "7377C7F45A797C6E5DBB1BB2843DA3FC76043E33687BEF3172"), + "011E88387D58EBB8E5CDCC38D431EEF404666D67944510D7120985822A6516EFE0" + "35D807AC804F348AF78F201A88B0F06E8C9BF4F5DEF448558B3F2BB15DF7A6F3F6" + "A34FA81F4478847BB4BE2F29C586F627D2370115969617EF4B35B32D2E522B0DA8" + "905B2581E5DEE0467003FB835EA2D1FEDF82635941D45E0C3A57FFBD763D1C56D6" + "B63FED9A0CAABE7436CC82DCED6563667B4F5BC037AC54BFE25B821F92E8CCDD0C" + "13571FDFD3D833777EF7C13B368224DE27FF6570B4DDA8A1F1D0F75F69701FA40A" + "4EE65DB853CF02A130E492F0D998FCA6B581E41E678AA47E301246A63DF92780D9" + "1478858417F0ED0E1E3E18AA3E4A18DFC75F1D6FCE24C6C952"), wvcdm::a2bs_hex( "E7C566D86E98C36D2DCA54A966E7B469B6094B9201F200932F8EB5E1A94FB0B977" "FAB8DFDAD57C677E279615F4EAFA872CA8EFF83179E4DE2AB78E6B41A860C42203" @@ -1410,14 +1410,14 @@ Cenc30SampleInfo kCenc30CencKey32Sample = { wvcdm::a2bs_hex("30303030303030303030303030303032"), wvcdm::a2bs_hex("9FBE45DD47DA7EBA09A3E24CBA95C9AF"), wvcdm::a2bs_hex( - "1B605E32B31D6245BCCC01C4E7720725B6094B9201F200932F8EB5E1A94FB0B977" - "FAB8DFDAD57C677E279615F4EAFA872CA8EFF83179E4DE2AB78E6B41A860C42203" - "4B875AC282406E03AC01F2E407A55DE38C6C35707F34B3319646FA016A01CE9056" - "E55D28C48ED72F10FA6625656ED62B758CBADA757DDC52533C9CBD54FC1A46F827" - "CC7B69BA66AE19A15D725FCBB972B23C83F95C0F00F481A7C9AC8687DBFDF7F684" - "3A552DCB7C38E461EDF5F3720A35234070799173B37219127141922CBA8CB2DC48" - "EC2477832D1AE477942DCDA93C0886AF72D71E56DA3D7737E49670B024639A195B" - "7377C7F45A797C6E5DBB1BB2843DA3FC76043E33687BEF3172"), + "1B605E32B31D6245BCCC01C4E7720725DE501171286AFE05602A6ECE249CC23BD6" + "35128297D26F488CB9599C26FBDC1EEB641CD06CD2A8DEBC29AFA8B1AE5602DA47" + "0B147A9C4FB9E3D301F7802329F13BFACB2835341BEB208FAFDDD1EE31BEC73E66" + "EA62620D6658AC17C543CA7BD65EC91BF8F1EC6FB5E7F2099FD49A65C561CF483C" + "25BEDBE8FC5889680B53543A8271BA8DD371DB351C56D0D1C8611ADE078614F333" + "C01E9C6B2B0041B2D04AF0428B706203F58E02EBE7BE37BF8E295EAA98FD454BA2" + "461666FF55743FB51846166C6EAC70009B549C3295E140DC91B68E78BEB6AF4F3C" + "AEA2B6778480DB26CFC34ABCC658AFA7FDE1AA8ABBC9012080"), wvcdm::a2bs_hex( "E7C566D86E98C36D2DCA54A966E7B469B6094B9201F200932F8EB5E1A94FB0B977" "FAB8DFDAD57C677E279615F4EAFA872CA8EFF83179E4DE2AB78E6B41A860C42203" @@ -1436,14 +1436,14 @@ Cenc30SampleInfo kCenc30CensKey33Sample = { wvcdm::a2bs_hex("30303030303030303030303030303033"), wvcdm::a2bs_hex("9FBE45DD47DA7EBA09A3E24CBA95C9AF"), wvcdm::a2bs_hex( - "011E88387D58EBB8E5CDCC38D431EEF4B6094B9201F200932F8EB5E1A94FB0B977" - "FAB8DFDAD57C677E279615F4EAFA872CA8EFF83179E4DE2AB78E6B41A860C42203" - "4B875AC282406E03AC01F2E407A55DE38C6C35707F34B3319646FA016A01CE9056" - "E55D28C48ED72F10FA6625656ED62B758CBADA757DDC52533C9CBD54FC1A46F827" - "CC7B69BA66AE19A15D725FCBB972B23C83F95C0F00F481A7C9AC868701CB8BE038" - "15BBFFB95FD3A86F142127720A35234070799173B37219127141922CBA8CB2DC48" - "EC2477832D1AE477942DCDA93C0886AF72D71E56DA3D7737E49670B024639A195B" - "7377C7F45A797C6E5DBB1BB2843DA3FC76043E33687BEF3172"), + "011E88387D58EBB8E5CDCC38D431EEF404666D67944510D7120985822A6516EFE0" + "35D807AC804F348AF78F201A88B0F06E8C9BF4F5DEF448558B3F2BB15DF7A6F3F6" + "A34FA81F4478847BB4BE2F29C586F627D2370115969617EF4B35B32D2E522B0DA8" + "905B2581E5DEE0467003FB835EA2D1FEDF82635941D45E0C3A57FFBD763D1C56D6" + "B63FED9A0CAABE7436CC82DCED6563667B4F5BC037AC54BFE25B821F92E8CCDD0C" + "13571FDFD3D833777EF7C13B368224DE27FF6570B4DDA8A1F1D0F75F69701FA40A" + "4EE65DB853CF02A130E492F0D998FCA6B581E41E678AA47E301246A63DF92780D9" + "1478858417F0ED0E1E3E18AA3E4A18DFC75F1D6FCE24C6C952"), wvcdm::a2bs_hex( "E7C566D86E98C36D2DCA54A966E7B469B6094B9201F200932F8EB5E1A94FB0B977" "FAB8DFDAD57C677E279615F4EAFA872CA8EFF83179E4DE2AB78E6B41A860C42203" @@ -6219,10 +6219,6 @@ TEST_P(WvCenc30Test, DecryptionTest) { decryption_parameters.is_encrypted = data->is_encrypted; decryption_parameters.is_secure = false; decryption_parameters.cipher_mode = data->cipher_mode; - if (data->cipher_mode == kCipherModeCtr) { - decryption_parameters.pattern_descriptor.encrypt_blocks = 1; - decryption_parameters.pattern_descriptor.skip_blocks = 9; - } decryption_parameters.subsample_flags = data->subsample_flags; EXPECT_EQ(NO_ERROR, decryptor_->Decrypt(session_id_, false, decryption_parameters)); @@ -6283,10 +6279,6 @@ TEST_P(WvCenc30SwitchCipherModeTest, DecryptionTest) { decryption_parameters.is_encrypted = data->is_encrypted; decryption_parameters.is_secure = false; decryption_parameters.cipher_mode = data->cipher_mode; - if (data->cipher_mode == kCipherModeCtr) { - decryption_parameters.pattern_descriptor.encrypt_blocks = 1; - decryption_parameters.pattern_descriptor.skip_blocks = 9; - } decryption_parameters.subsample_flags = data->subsample_flags; EXPECT_EQ(NO_ERROR, decryptor_->Decrypt(session_id_, false, decryption_parameters));