From d4801531e4a6d2b218a02e6f9cf48de47b17d448 Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Thu, 2 May 2019 17:36:15 -0700 Subject: [PATCH] Fix OEMCrypto UsageTableTest.GenerateReportWrongPST Merge from Widevine repo of http://go/wvgerrit/78063 This test incorrectly asserted a buffer size. Bug: 131864150 Test: Unit tests ran on taimen. Change-Id: If53fdd4cce9d6b3dfa85f50a3dbc08c99bceebfb --- libwvdrmengine/oemcrypto/test/oec_session_util.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libwvdrmengine/oemcrypto/test/oec_session_util.cpp b/libwvdrmengine/oemcrypto/test/oec_session_util.cpp index 4ed98c50..7e09a800 100644 --- a/libwvdrmengine/oemcrypto/test/oec_session_util.cpp +++ b/libwvdrmengine/oemcrypto/test/oec_session_util.cpp @@ -1268,7 +1268,6 @@ void Session::GenerateReport(const std::string& pst, ASSERT_EQ(OEMCrypto_ERROR_SHORT_BUFFER, sts); } if (sts == OEMCrypto_ERROR_SHORT_BUFFER) { - ASSERT_EQ(wvcdm::Unpacked_PST_Report::report_size(pst.length()), length); pst_report_buffer_.assign(length, 0xFF); // Fill with garbage values. } sts = OEMCrypto_ReportUsage(session_id(), @@ -1278,7 +1277,7 @@ void Session::GenerateReport(const std::string& pst, if (expected_result != OEMCrypto_SUCCESS) { return; } - ASSERT_EQ(pst_report_buffer_.size(), length); + EXPECT_EQ(wvcdm::Unpacked_PST_Report::report_size(pst.length()), length); vector computed_signature(SHA_DIGEST_LENGTH); unsigned int sig_len = SHA_DIGEST_LENGTH; HMAC(EVP_sha1(), mac_key_client_.data(), mac_key_client_.size(),