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

Add InactiveUnused to Usage Report status

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/22963

This change kInactive to kInactiveUsed and adds kInactiveUnused to the
possible values for the status field in the Usage Report.  This CL
updates the header, the unit tests, and haystack and reference code.

b/32714323

Change-Id: If8d8e32ea1e3dc18da34e5fae35f578b027de9c7
This commit is contained in:
Fred Gylys-Colwell
2017-01-20 18:52:02 -08:00
parent b2a3921b37
commit a494eeafdc
8 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -842,7 +842,7 @@ void Session::GenerateReport(const std::string& pst, bool expect_success,
length - SHA_DIGEST_LENGTH, &computed_signature[0], &sig_len);
EXPECT_EQ(0, memcmp(&computed_signature[0], pst_report()->signature,
SHA_DIGEST_LENGTH));
EXPECT_GE(kInactive, pst_report()->status);
EXPECT_GE(kInactiveUnused, pst_report()->status);
EXPECT_GE(kHardwareSecureClock, pst_report()->clock_security_level);
EXPECT_EQ(pst.length(), pst_report()->pst_length);
EXPECT_EQ(0, memcmp(pst.c_str(), pst_report()->pst, pst.length()));

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

@@ -4405,7 +4405,7 @@ TEST_P(UsageTableTestWithMAC, OnlineLicense) {
kTimeTolerance);
ASSERT_NO_FATAL_FAILURE(DeactivatePST(pst));
ASSERT_NO_FATAL_FAILURE(s.GenerateReport(pst));
EXPECT_EQ(kInactive, s.pst_report()->status);
EXPECT_EQ(kInactiveUsed, s.pst_report()->status);
EXPECT_NEAR(0,
wvcdm::htonll64(s.pst_report()->seconds_since_license_received),
kTimeTolerance);
@@ -4696,7 +4696,7 @@ TEST_P(UsageTableTestWithMAC, DeleteInactiveEntry) {
Session s2;
ASSERT_NO_FATAL_FAILURE(s2.open());
s2.GenerateReport(pst, true, &s);
EXPECT_EQ(kInactive, s2.pst_report()->status);
EXPECT_EQ(kInactiveUsed, s2.pst_report()->status);
ASSERT_NO_FATAL_FAILURE(s2.DeleteEntry(pst));
ASSERT_NO_FATAL_FAILURE(s2.close());
@@ -4868,7 +4868,7 @@ TEST_P(UsageTableTestWithMAC, GenericCryptoEncrypt) {
kTimeTolerance);
ASSERT_NO_FATAL_FAILURE(DeactivatePST(pst));
ASSERT_NO_FATAL_FAILURE(session_.GenerateReport(pst));
EXPECT_EQ(kInactive, session_.pst_report()->status);
EXPECT_EQ(kInactiveUsed, session_.pst_report()->status);
EXPECT_NEAR(
0, wvcdm::htonll64(session_.pst_report()->seconds_since_license_received),
kTimeTolerance);
@@ -4916,7 +4916,7 @@ TEST_P(UsageTableTestWithMAC, GenericCryptoDecrypt) {
kTimeTolerance);
ASSERT_NO_FATAL_FAILURE(DeactivatePST(pst));
session_.GenerateReport(pst);
EXPECT_EQ(kInactive, session_.pst_report()->status);
EXPECT_EQ(kInactiveUsed, session_.pst_report()->status);
EXPECT_NEAR(
0, wvcdm::htonll64(session_.pst_report()->seconds_since_license_received),
kTimeTolerance);
@@ -4973,7 +4973,7 @@ TEST_P(UsageTableTestWithMAC, GenericCryptoSign) {
kTimeTolerance);
ASSERT_NO_FATAL_FAILURE(DeactivatePST(pst));
ASSERT_NO_FATAL_FAILURE(session_.GenerateReport(pst));
EXPECT_EQ(kInactive, session_.pst_report()->status);
EXPECT_EQ(kInactiveUsed, session_.pst_report()->status);
EXPECT_NEAR(
0, wvcdm::htonll64(session_.pst_report()->seconds_since_license_received),
kTimeTolerance);
@@ -5024,7 +5024,7 @@ TEST_P(UsageTableTestWithMAC, GenericCryptoVerify) {
kTimeTolerance);
ASSERT_NO_FATAL_FAILURE(DeactivatePST(pst));
ASSERT_NO_FATAL_FAILURE(session_.GenerateReport(pst));
EXPECT_EQ(kInactive, session_.pst_report()->status);
EXPECT_EQ(kInactiveUsed, session_.pst_report()->status);
EXPECT_NEAR(
0, wvcdm::htonll64(session_.pst_report()->seconds_since_license_received),
kTimeTolerance);
@@ -5247,7 +5247,7 @@ TEST_P(UsageTableTestWithMAC, DeactivateOfflineLicense) {
ASSERT_NO_FATAL_FAILURE(
s.TestDecryptCTR(false, OEMCrypto_ERROR_UNKNOWN_FAILURE));
s.GenerateReport(pst);
EXPECT_EQ(kInactive, s.pst_report()->status);
EXPECT_EQ(kInactiveUsed, s.pst_report()->status);
EXPECT_NEAR(0,
wvcdm::htonll64(s.pst_report()->seconds_since_license_received),
kTimeTolerance);
@@ -5270,7 +5270,7 @@ TEST_P(UsageTableTestWithMAC, DeactivateOfflineLicense) {
Session s3;
ASSERT_NO_FATAL_FAILURE(s3.open());
s3.GenerateReport(pst, true, &s);
EXPECT_EQ(kInactive, s3.pst_report()->status);
EXPECT_EQ(kInactiveUsed, s3.pst_report()->status);
}
TEST_P(UsageTableTestWithMAC, BadRange) {
@@ -5362,7 +5362,7 @@ TEST_F(UsageTableTest, TimingTest) {
time_t report_generated3 = time(NULL);
s3.GenerateReport(pst3);
EXPECT_EQ(kInactive, s1.pst_report()->status);
EXPECT_EQ(kInactiveUsed, s1.pst_report()->status);
EXPECT_NEAR(report_generated1 - loaded1,
wvcdm::htonll64(s1.pst_report()->seconds_since_license_received),
kTimeTolerance);
@@ -5485,7 +5485,7 @@ TEST_F(UsageTableTest, VerifyUsageTimes) {
ASSERT_NO_FATAL_FAILURE(DeactivatePST(pst));
ASSERT_NO_FATAL_FAILURE(s.GenerateReport(pst));
EXPECT_EQ(kInactive, s.pst_report()->status);
EXPECT_EQ(kInactiveUsed, s.pst_report()->status);
ASSERT_NO_FATAL_FAILURE(
s.TestDecryptCTR(false, OEMCrypto_ERROR_UNKNOWN_FAILURE));
}
@@ -5538,7 +5538,7 @@ TEST_F(UsageTableTest, PSTLargeBuffer) {
ASSERT_NO_FATAL_FAILURE(
s.TestDecryptCTR(false, OEMCrypto_ERROR_UNKNOWN_FAILURE));
ASSERT_NO_FATAL_FAILURE(s.GenerateReport(pst));
EXPECT_EQ(kInactive, s.pst_report()->status);
EXPECT_EQ(kInactiveUsed, s.pst_report()->status);
EXPECT_NEAR(0,
wvcdm::htonll64(s.pst_report()->seconds_since_license_received),
kTimeTolerance);
@@ -5561,7 +5561,7 @@ TEST_F(UsageTableTest, PSTLargeBuffer) {
Session s3;
ASSERT_NO_FATAL_FAILURE(s3.open());
ASSERT_NO_FATAL_FAILURE(s3.GenerateReport(pst, true, &s));
EXPECT_EQ(kInactive, s3.pst_report()->status);
EXPECT_EQ(kInactiveUsed, s3.pst_report()->status);
}
TEST_F(UsageTableTest, DeleteEntryLargeBuffer) {