widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix default cipher mode for CAS unit test

Browse Source 
[ Merge of http://go/wvgerrit/194571 ]

Default to OEMCrypto_CipherMode_CBC instead of OEMCrypto_CipherMode_CENC
which is not used by CAS.

Test: CAS unit tests
Bug: 325639114
Bug: 322928572
Merged from https://widevine-internal-review.googlesource.com/193650

Change-Id: I8876d5262643015fb6a322eae6444ef4001d146d
This commit is contained in:
Cong Lin
2024-03-11 10:35:18 -07:00
committed by Rahul Frias
parent b30452a3f6
commit c33960cb7c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/oemcrypto/test/oec_session_util.cpp
View File

@@ -1414,6 +1414,7 @@ void EntitledMessage::LoadCasKeys(bool load_even, bool load_odd,
even_key.content_key_data_iv = entitled_key_array_[0].content_key_data_iv; even_key.content_key_data_iv = entitled_key_array_[0].content_key_data_iv;
even_key.content_key_data = entitled_key_array_[0].content_key_data; even_key.content_key_data = entitled_key_array_[0].content_key_data;
even_key.content_iv = entitled_key_array_[0].content_iv; even_key.content_iv = entitled_key_array_[0].content_iv;
even_key.cipher_mode = OEMCrypto_CipherMode_CBC;
} }
if (has_odd) { if (has_odd) {
odd_key.entitlement_key_id = entitled_key_array_[1].entitlement_key_id; odd_key.entitlement_key_id = entitled_key_array_[1].entitlement_key_id;
@@ -1421,6 +1422,7 @@ void EntitledMessage::LoadCasKeys(bool load_even, bool load_odd,
odd_key.content_key_data_iv = entitled_key_array_[1].content_key_data_iv; odd_key.content_key_data_iv = entitled_key_array_[1].content_key_data_iv;
odd_key.content_key_data = entitled_key_array_[1].content_key_data; odd_key.content_key_data = entitled_key_array_[1].content_key_data;
odd_key.content_iv = entitled_key_array_[1].content_iv; odd_key.content_iv = entitled_key_array_[1].content_iv;
odd_key.cipher_mode = OEMCrypto_CipherMode_CBC;
} }
OEMCryptoResult sts = OEMCrypto_LoadCasECMKeys( OEMCryptoResult sts = OEMCrypto_LoadCasECMKeys(