From 89871ba834ab95a972489a34cd73122c850e3fbc Mon Sep 17 00:00:00 2001 From: Cong Lin Date: Mon, 11 Mar 2024 10:35:18 -0700 Subject: [PATCH] Fix default cipher mode for CAS unit test Merge of https://widevine-internal-review.git.corp.google.com/c/cdm/+/193670 Default to OEMCrypto_CipherMode_CBC instead of OEMCrypto_CipherMode_CENC which is not used by CAS. Test: CAS unit tests Bug: 325639114 Bug: 322928572 Change-Id: I8876d5262643015fb6a322eae6444ef4001d146d --- libwvdrmengine/oemcrypto/test/oec_session_util.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/test/oec_session_util.cpp b/libwvdrmengine/oemcrypto/test/oec_session_util.cpp index e6e4e329..f11676db 100644 --- a/libwvdrmengine/oemcrypto/test/oec_session_util.cpp +++ b/libwvdrmengine/oemcrypto/test/oec_session_util.cpp @@ -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 = 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; 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 = 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(