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

Merge "Fix default cipher mode for CAS unit test" into udc-widevine-dev

Browse Source
This commit is contained in:
Treehugger Robot
2024-03-20 19:39:12 +00:00
committed by Android (Google) Code Review
parent bb71b1261e 89871ba834
commit 8d23655439
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1380,13 +1380,15 @@ 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;
odd_key.content_key_id = entitled_key_array_[1].content_key_id; odd_key.content_key_id = entitled_key_array_[1].content_key_id;
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;
even_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(