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 vic-widevine-dev

Browse Source
This commit is contained in:
Rahul Frias
2024-04-18 07:18:38 +00:00
committed by Android (Google) Code Review
parent 95b50d39ba c33960cb7c
commit c5a48e1cf3
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(