widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test MAC signature after license reload am: 407d39699b

Browse Source 
am: a3d5e7be6a

Change-Id: Ia110288e7d06dcbe7aaebe6c54e42a64402f1a4f
This commit is contained in:
Fred Gylys-Colwell
2019-05-08 00:53:00 -07:00
committed by android-build-merger
parent 29dac7ac57 a3d5e7be6a
commit a35722f358
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/oemcrypto/test/oec_session_util.cpp
View File

@@ -1358,6 +1358,9 @@ void Session::GenerateVerifyReport(const std::string& pst,
Test_PST_Report expected(pst, status); Test_PST_Report expected(pst, status);
ASSERT_NO_FATAL_FAILURE(VerifyReport(expected, time_license_received, ASSERT_NO_FATAL_FAILURE(VerifyReport(expected, time_license_received,
time_first_decrypt, time_last_decrypt)); time_first_decrypt, time_last_decrypt));
// The PST report was signed above. Below we verify that the entire message
// that is sent to the server will be signed by the right mac keys.
ASSERT_NO_FATAL_FAILURE(VerifyClientSignature());
} }
void Session::CreateOldEntry(const Test_PST_Report& report) { void Session::CreateOldEntry(const Test_PST_Report& report) {

6
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -5502,9 +5502,9 @@ TEST_P(UsageTableTestWithMAC, ReloadOfflineLicenseWithRefresh) {
ASSERT_NO_FATAL_FAILURE(s.close()); ASSERT_NO_FATAL_FAILURE(s.close());
} }
// Verify that a license that has been we can still reload an offline license // Verify that we can still reload an offline license after OEMCrypto_Terminate
// after OEMCrypto_Terminate and Initialize are called. This is as close to a // and Initialize are called. This is as close to a reboot as we can do in a
// reboot as we can do in a unit test. // unit test.
TEST_P(UsageTableTestWithMAC, ReloadOfflineLicenseWithTerminate) { TEST_P(UsageTableTestWithMAC, ReloadOfflineLicenseWithTerminate) {
std::string pst = "my_pst"; std::string pst = "my_pst";
Session s; Session s;