From 6c7988f8c9b1671d6dafba69ddfdae61ee7c9368 Mon Sep 17 00:00:00 2001 From: Matt Feddersen Date: Mon, 12 Feb 2024 13:29:39 -0800 Subject: [PATCH] Don't force decrypt count to increase for bypass Bug: 324261677 Merged from https://widevine-internal-review.googlesource.com/191631 Change-Id: I371fc22ad330402aed0e10cb3cba8641abe00bea --- .../oemcrypto/test/oemcrypto_usage_table_test.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_usage_table_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_usage_table_test.cpp index 8394cf3f..40491b42 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_usage_table_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_usage_table_test.cpp @@ -175,8 +175,13 @@ TEST_F(OEMCryptoSessionTests, MasterGeneration_IncrementCounterAPI18) { ASSERT_TRUE(prov_count2 == prov_count1); ASSERT_TRUE(lic_count2 > lic_count1); - ASSERT_TRUE(decrypt_count2 > decrypt_count1); ASSERT_TRUE(master_generation_number2 > master_generation_number1); + + // Log if decrypt counter hasn't gone up. Not a hard requirement, so don't + // assert for it. + if (decrypt_count2 <= decrypt_count1) { + LOGE("Decrypt count did not increase."); + } } TEST_P(OEMCryptoUsageTableTest,