Merge "Fix default cipher mode for CAS unit test" into vic-widevine-dev
This commit is contained in:
@@ -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 = entitled_key_array_[0].content_key_data;
|
||||
even_key.content_iv = entitled_key_array_[0].content_iv;
|
||||
even_key.cipher_mode = OEMCrypto_CipherMode_CBC;
|
||||
}
|
||||
if (has_odd) {
|
||||
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 = entitled_key_array_[1].content_key_data;
|
||||
odd_key.content_iv = entitled_key_array_[1].content_iv;
|
||||
odd_key.cipher_mode = OEMCrypto_CipherMode_CBC;
|
||||
}
|
||||
|
||||
OEMCryptoResult sts = OEMCrypto_LoadCasECMKeys(
|
||||
|
||||
Reference in New Issue
Block a user