Merge Changes from CDM repository

This CL merges the following changes from the Widevine repository: Avoid CdmSession reinitialization https://widevine-internal-review.googlesource.com/#/c/10530/ Fix timer-related unit tests. https://widevine-internal-review.googlesource.com/#/c/10510/ Correct return statement bug: 15590802 https://widevine-internal-review.googlesource.com/#/c/10553/ Usage reporting fixes bug/15388863 https://widevine-internal-review.googlesource.com/#/c/10460/ Make public methods virtual https://widevine-internal-review.googlesource.com/#/c/10500/ Fix the SetTimer contract in the CDM. https://widevine-internal-review.googlesource.com/#/c/10493/ Move inline CDM methods, add OVERRIDE. https://widevine-internal-review.googlesource.com/#/c/10475/ Simplify storage APIs related cleanup. https://widevine-internal-review.googlesource.com/#/c/10473/ Duration values are not correctly reported when queried b/15592374 https://widevine-internal-review.googlesource.com/#/c/10437/ Propagate IsKeyValid() through ContentDecryptionModule. https://widevine-internal-review.googlesource.com/#/c/10483/ Minor clean up in config_test_env. https://widevine-internal-review.googlesource.com/#/c/10440/ General clean up. https://widevine-internal-review.googlesource.com/#/c/10441/ Refactor HttpSocket and simplify UrlRequest interface. https://widevine-internal-review.googlesource.com/#/c/10410/ Install good keybox at end of unit tests b/15385981 https://widevine-internal-review.googlesource.com/#/c/10374/ Privacy crypto fixes b/15475012 https://widevine-internal-review.googlesource.com/#/c/10383/ Incorporate header files to resolve build issued based on customers feedback. https://widevine-internal-review.googlesource.com/#/c/10420/ Support unprovisioning b/12247651 https://widevine-internal-review.googlesource.com/#/c/10356/ Correct usage of Host::Allocate and Cdm::Decrypt. https://widevine-internal-review.googlesource.com/#/c/10378/ Fix logging bug, arguments in wrong order. https://widevine-internal-review.googlesource.com/#/c/10380/ Rename types that look like constants. https://widevine-internal-review.googlesource.com/#/c/10379/ Fix offline test failures b/13909635 https://widevine-internal-review.googlesource.com/#/c/10348/ Add -DUNIT_TEST to the unit test makefile for Android https://widevine-internal-review.googlesource.com/#/c/10375/ Refactor privacy-crypto and add dummy version. https://widevine-internal-review.googlesource.com/#/c/10353/ Remove References to Apiary https://widevine-internal-review.googlesource.com/#/c/9924/ Delete oldest entry in usage table when full bug: 15184824 https://widevine-internal-review.googlesource.com/#/c/10295/ Port DeviceFiles to iOS. https://widevine-internal-review.googlesource.com/#/c/10355/ Make testing functions in DeviceFiles private. https://widevine-internal-review.googlesource.com/#/c/10354/ Add RSA encryption to haystack https://widevine-internal-review.googlesource.com/#/c/10280/ Add string and vector includes to CDM header. https://widevine-internal-review.googlesource.com/#/c/10352/ First version of oemcrypto logging https://widevine-internal-review.googlesource.com/#/c/10252/ Update Names of Secure Stop Methods bug: 11987015 https://widevine-internal-review.googlesource.com/#/c/10152/ Adjust timing on the Usage Table unit test https://widevine-internal-review.googlesource.com/#/c/10307/ Fix all compiler warnings in CDM source release. https://widevine-internal-review.googlesource.com/#/c/10293/ Fix memset bug: args in wrong order https://widevine-internal-review.googlesource.com/#/c/10292/ Partial revert of 'Remove refs to test prov server, Level3 support...' https://widevine-internal-review.googlesource.com/#/c/10281/ Pack structure OEMCrypto_PST_Report https://widevine-internal-review.googlesource.com/#/c/10243/ Remove refs to test prov server, Level3 support; remove dead code https://widevine-internal-review.googlesource.com/#/c/10220/ Partial revert of 'Document data strings; clean up license server parameters.' https://widevine-internal-review.googlesource.com/#/c/10188/ Document data strings; clean up license server parameters. https://widevine-internal-review.googlesource.com/#/c/10120/ Fix broken build after partner branch merge. https://widevine-internal-review.googlesource.com/#/c/10181/ TODO Cleanup - core/src, core/include https://widevine-internal-review.googlesource.com/#/c/9965/ TODO Cleanup - cdm, chromium, core/test. https://widevine-internal-review.googlesource.com/#/c/9419/ Remove unneeded properties. https://widevine-internal-review.googlesource.com/#/c/10162/ Change-Id: If2bb9d743a562a3875bebb91933c0aaadea286b2
2014-06-25 13:02:54 -07:00
parent 8a8feb747c
commit b5e8b87fed
66 changed files with 2927 additions and 1998 deletions
--- a/libwvdrmengine/oemcrypto/test/Makefile
+++ b/libwvdrmengine/oemcrypto/test/Makefile
@@ -1,109 +0,0 @@
-#
-# Builds oemcrypto_unittests
-#
-#PROJECTS_ROOT = ~projects
-#
-ifndef PROJECTS_ROOT
-PROJECTS_ROOT = ../../../../..
-endif
-
-CDM_ROOT = $(PROJECTS_ROOT)/cdm
-CDM_SRC_PATH = $(CDM_ROOT)/cdm
-CDM_BASE_INCLUDE_PATH = $(CDM_SRC_PATH)/include
-
-EUREKA_ROOT = $(PROJECTS_ROOT)/eureka/eureka
-CHROME_ROOT = $(EUREKA_ROOT)/src/chromium/src
-#
-# build outputs should go into Chrome repository, such as ../chromium/src/out
-# or some local equivalent.
-# WARNING: splitting outputs from CHROME_ROOT can lead to build errors
-ifndef CHROME_ROOT
-CHROME_ROOT = $(CDM_ROOT)/out
-endif
-
-# TARGET_PLATFORM from {x86,eureka}
-ifndef TARGET_PLATFORM
-TARGET_PLATFORM = x86
-endif
-
-# TARGET_BUILD from {debug,release}
-ifndef TARGET_BUILD
-TARGET_BUILD = debug
-endif
-
-ifeq ($(TARGET_PLATFORM),x86)
-  BUILDPLATFORM = out_x86_linux
-else ifeq ($(TARGET_PLATFORM),eureka)
-  BUILDPLATFORM = out_arm_eureka
-else
-  BUILDPLATFORM = UNKNOWN
-endif
-
-ifeq ($(TARGET_BUILD),debug)
-  BUILDTYPE = Debug
-else ifeq ($(TARGET_BUILD),release)
-  BUILDTYPE = Release
-else
-  BUILDTYPE = UNKNOWN
-endif
-
-BUILDPATH = $(CHROME_ROOT)/$(BUILDPLATFORM)/$(BUILDTYPE)
-OBJPATH = $(BUILDPATH)/obj
-
-CHROME_THIRD_PARTY_LIBS = $(BUILDPATH)/obj/third_party
-
-# target image file name
-TARGET_TEST_EXE = oemcrypto_unittests
-
-TARGET_OBJECTS = oemcrypto_test.o
-
-OBJECTDIR = $(OBJPATH)/oemcrypto_unittests
-
-INSTALLDIR = $(BUILDPATH)
-
-LIBGTEST_INCLUDE = $(CDM_SRC_PATH)/prebuilt/gtest/include
-LIBGTEST_LIBS = $(CDM_SRC_PATH)/prebuilt/gtest/$(BUILDPLATFORM)/$(BUILDTYPE)/lib
-LIBGTEST_LIBNAME = gtest
-
-INCLUDES = \
-        -I$(LIBGTEST_INCLUDE) \
-        -I$(CDM_BASE_INCLUDE_PATH)
-
-LIBDIRS = \
-        -L$(INSTALLDIR) \
-        -L$(LIBGTEST_LIBS)
-
-OBJECTS := $(patsubst %.o,$(OBJECTDIR)/%.o,$(TARGET_OBJECTS))
-
-CXXFLAGS = -m64 -fPIC -W -Wall -g -DCDM_TEST
-LINK = $(CXX)
-MKDIR = mkdir -p
-
-$(INSTALLDIR)/$(TARGET_TEST_EXE): $(OBJECTDIR) $(INSTALLDIR) $(OBJECTS)
-	$(CXX) -v -fPIC -m64 $(OBJECTS) $(LIBDIRS) -loemcrypto_mock \
-	-lcrypto -ldl -lrt -lpthread -l$(LIBGTEST_LIBNAME) -o $@
-	@echo "[Unit test image: " $(INSTALLDIR)/$(TARGET_TEST_EXE) "]"
-
-$(OBJECTDIR)/%.o: %.cpp
-	$(CXX) -c $(CXXFLAGS) $(INCLUDES) $< -o $@
-
-$(OBJECTDIR)/%.o: %.cc
-	$(CXX) -c $(CXXFLAGS) $(INCLUDES) $< -o $@
-
-clean:
-	$(RM) -rf $(OBJECTDIR)
-	$(RM) -rf $(INSTALLDIR)/$(TARGET_TEST_EXE)
-
-$(OBJECTDIR):
-	@$(MKDIR) $@
-
-$(INSTALLDIR):
-	@$(MKDIR) $@
-
-.PHONY: $(OBJECTDIR)
-
-.PHONY: $(INSTALLDIR)
-
-.PHONY: clean
-
-.PHONY: test
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -89,6 +89,9 @@ struct PaddedPSTReport {
  uint8_t padding[256];
 };

+// These are test keyboxes.  They will not be accepted by production systems.
+// By using known keyboxes for these tests, the results for a given set of
+// inputs to a test are predictable and can be compared to the actual results.
 const wvoec_mock::WidevineKeybox kDefaultKeybox = {
  // Sample keybox used for test vectors
  {
@@ -185,9 +188,8 @@ static wvoec_mock::WidevineKeybox kValidKeybox03 = {
  }
 };

-/* Note: Key 1 was 3072 bits. We are only generating 2048 bit keys,
-   so we do not need to test with 3072 bit keys. */
-
+// A 2048-bit test RSA Private Key
+// This is used to verify the functions that manipulate RSA keys.
 static const uint8_t kTestPKCS1RSAPrivateKey2_2048[] = {
  0x30, 0x82, 0x04, 0xa2, 0x02, 0x01, 0x00, 0x02,
  0x82, 0x01, 0x01, 0x00, 0xa7, 0x00, 0x36, 0x60,
@@ -339,7 +341,8 @@ static const uint8_t kTestPKCS1RSAPrivateKey2_2048[] = {
  0xf7, 0xc1, 0x22, 0x36, 0xd9, 0x18, 0x56, 0xfe,
  0x39, 0x28, 0x33, 0xe0, 0xdb, 0x03 };

-// 2048 bit RSA key in PKCS#8 PrivateKeyInfo
+// A 2048 bit RSA key in PKCS#8 PrivateKeyInfo format
+// Used to verify the functions that manipulate RSA keys.
 static const uint8_t kTestRSAPKCS8PrivateKeyInfo2_2048[] = {
  0x30, 0x82, 0x04, 0xbc, 0x02, 0x01, 0x00, 0x30,
  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7,
@@ -494,6 +497,8 @@ static const uint8_t kTestRSAPKCS8PrivateKeyInfo2_2048[] = {
  0x72, 0x2c, 0xf7, 0xc1, 0x22, 0x36, 0xd9, 0x18,
  0x56, 0xfe, 0x39, 0x28, 0x33, 0xe0, 0xdb, 0x03 };

+// A 2048 bit RSA Public key
+// Used to verify the functions that manipulate RSA keys.
 static const uint8_t kTestRSAPublicKey2_2048[] = {
  0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01,
  0x00, 0xa7, 0x00, 0x36, 0x60, 0x65, 0xdc, 0xbd,
@@ -530,6 +535,8 @@ static const uint8_t kTestRSAPublicKey2_2048[] = {
  0x6b, 0xbb, 0xbb, 0x2c, 0x5f, 0xcf, 0xb3, 0x7a,
  0x05, 0x02, 0x03, 0x01, 0x00, 0x01 };

+// A second 2048-bit RSA private key
+// This is used to verify the functions that manipulate RSA keys.
 static const uint8_t kTestPKCS1RSAPrivateKey3_2048[] = {
  0x30, 0x82, 0x04, 0xa4, 0x02, 0x01, 0x00, 0x02,
  0x82, 0x01, 0x01, 0x00, 0xa5, 0xd0, 0xd7, 0x3e,
@@ -681,7 +688,8 @@ static const uint8_t kTestPKCS1RSAPrivateKey3_2048[] = {
  0x98, 0x18, 0x0e, 0x65, 0xb6, 0x4b, 0x69, 0x0b,
  0x21, 0xdc, 0x86, 0x17, 0x6e, 0xc8, 0xee, 0x24 };

-// 2048 bit RSA key in PKCS#8 PrivateKeyInfo
+// A second 2048 bit RSA key in PKCS#8 PrivateKeyInfo format
+// Used to verify the functions that manipulate RSA keys.
 static const uint8_t kTestRSAPKCS8PrivateKeyInfo3_2048[] = {
  0x30, 0x82, 0x04, 0xbe, 0x02, 0x01, 0x00, 0x30,
  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7,
@@ -837,6 +845,8 @@ static const uint8_t kTestRSAPKCS8PrivateKeyInfo3_2048[] = {
  0x69, 0x0b, 0x21, 0xdc, 0x86, 0x17, 0x6e, 0xc8,
  0xee, 0x24 };

+// A second 2048 bit RSA Public key
+// Used to verify the functions that manipulate RSA keys.
 static const uint8_t kTestRSAPublicKey3_2048[] = {
  0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01,
  0x00, 0xa5, 0xd0, 0xd7, 0x3e, 0x0e, 0x2d, 0xfb,
@@ -938,8 +948,11 @@ class Session {

  void FillDefaultContext(vector<uint8_t>* mac_context,
                          vector<uint8_t>* enc_context) {
-    /* These context strings are normally created by the CDM layer above from
-       a license request message. */
+    /* Context strings
+     * These context strings are normally created by the CDM layer
+     * from a license request message.
+     * They are used to test MAC and ENC key generation.
+     */
    *mac_context = wvcdm::a2b_hex(
        "41555448454e5449434154494f4e000a4c08001248000000020000101907d9ff"
        "de13aa95c122678053362136bdf8408f8276e4c2d87ec52b61aa1b9f646e5873"
@@ -963,6 +976,9 @@ class Session {
              OEMCrypto_GenerateDerivedKeys(session_id(), &mac_context[0],
                                            mac_context.size(), &enc_context[0],
                                            enc_context.size()));
+
+    // Expected MAC and ENC keys generated from context strings
+    // with test keybox "installed".
    mac_key_server_ = wvcdm::a2b_hex(
        "3CFD60254786AF350B353B4FBB700AB382558400356866BA16C256BCD8C502BF");
    mac_key_client_ = wvcdm::a2b_hex(
@@ -1047,7 +1063,8 @@ class Session {
      license_.keys[i].control.control_bits = htonl(control);
    }
    memcpy(license_.pst, pst.c_str(), min(sizeof(license_.pst), pst.length()));
-    // For the canned decryption content, The first key is:
+
+    // The first key for the canned decryption content.
    vector<uint8_t> key = wvcdm::a2b_hex("39AD33E5719656069F9EDE9EBBA7A77D");
    memcpy(license_.keys[0].key_data, &key[0], key.size());
  }
@@ -1166,6 +1183,7 @@ class Session {
    }

    // Set up our expected input and output
+    // This is dummy encrypted data.
    vector<uint8_t> encryptedData = wvcdm::a2b_hex(
        "ec261c115f9d5cda1d5cc7d33c4e37362d1397c89efdd1da5f0065c4848b0462"
        "337ba14693735203c9b4184e362439c0cea5e5d1a628425eddf8a6bf9ba901ca"
@@ -1177,6 +1195,7 @@ class Session {
        "fc14a9ab9647e6e31adabb72d792f0c9ba99dc3e9205657d28fc7771d64e6d4b");
    vector<uint8_t> encryptionIv =
        wvcdm::a2b_hex("719dbcb253b2ec702bb8c1b1bc2f3bc6");
+    // This is the expected decrypted data.
    vector<uint8_t> unencryptedData = wvcdm::a2b_hex(
        "19ef4361e16e6825b336e2012ad8ffc9ce176ab2256e1b98aa15b7877bd8c626"
        "fa40b2e88373457cbcf4f1b4b9793434a8ac03a708f85974cff01bddcbdd7a8e"
@@ -1231,6 +1250,7 @@ class Session {
      rsa_key_length = sizeof(kTestRSAPKCS8PrivateKeyInfo2_2048);
    }

+    // Dummy context for testing signature generation.
    vector<uint8_t> context = wvcdm::a2b_hex(
        "0a4c08001248000000020000101907d9ffde13aa95c122678053362136bdf840"
        "8f8276e4c2d87ec52b61aa1b9f646e58734930acebe899b3e464189a14a87202"
@@ -1426,6 +1446,8 @@ class Session {
                  &mac_context[0], mac_context.size(), &enc_context[0],
                  enc_context.size()));

+    // Expected MAC and ENC keys generated from context strings
+    // with RSA certificate "installed".
    mac_key_server_ = wvcdm::a2b_hex(
        "1E451E59CB663DA1646194DD28880788ED8ED2EFF913CBD6A0D535D1D5A90381");
    mac_key_client_ = wvcdm::a2b_hex(
@@ -1815,7 +1837,7 @@ class DISABLED_TestKeybox : public OEMCryptoClientTest {
  }
 };

-TEST_F(DISABLED_TestKeybox, CheckSystemID) {
+TEST_F(OEMCryptoClientTest, DISABLED_CheckSystemID) {
  OEMCryptoResult sts;
  uint8_t key_data[256];
  size_t key_data_len = sizeof(key_data);
@@ -1862,6 +1884,7 @@ TEST_F(DISABLED_TestKeybox, BadCRCKeybox) {
  InstallKeybox(keybox, false);
  sts = OEMCrypto_IsKeyboxValid();
  ASSERT_EQ(OEMCrypto_ERROR_BAD_CRC, sts);
+  InstallKeybox(kDefaultKeybox, true);
 }

 TEST_F(DISABLED_TestKeybox, BadMagicKeybox) {
@@ -1871,6 +1894,7 @@ TEST_F(DISABLED_TestKeybox, BadMagicKeybox) {
  InstallKeybox(keybox, false);
  sts = OEMCrypto_IsKeyboxValid();
  ASSERT_EQ(OEMCrypto_ERROR_BAD_MAGIC, sts);
+  InstallKeybox(kDefaultKeybox, true);
 }

 TEST_F(DISABLED_TestKeybox, BadDataKeybox) {
@@ -1880,6 +1904,7 @@ TEST_F(DISABLED_TestKeybox, BadDataKeybox) {
  InstallKeybox(keybox, false);
  sts = OEMCrypto_IsKeyboxValid();
  ASSERT_EQ(OEMCrypto_ERROR_BAD_CRC, sts);
+  InstallKeybox(kDefaultKeybox, true);
 }

 TEST_F(DISABLED_TestKeybox, GenerateSignature) {
@@ -1889,6 +1914,7 @@ TEST_F(DISABLED_TestKeybox, GenerateSignature) {

  s.GenerateDerivedKeys();

+  // Dummy context for testing signature generation.
  vector<uint8_t> context = wvcdm::a2b_hex(
      "0a4c08001248000000020000101907d9ffde13aa95c122678053362136bdf840"
      "8f8276e4c2d87ec52b61aa1b9f646e58734930acebe899b3e464189a14a87202"
@@ -2354,6 +2380,7 @@ TEST_F(DISABLED_TestKeybox, DecryptWithOffset) {
  ASSERT_EQ(OEMCrypto_SUCCESS, sts);

  // Set up our expected input and output
+  // This is dummy encrypted data.
  vector<uint8_t> encryptedData = wvcdm::a2b_hex(
      "c17055d4e3ab8e892b40ca2deed7cd46b406cd41d50f23d5877b36"
      "ad351887df2b3774dc413904afd958ba766cc6ab51a3ffd8f845296c5d8326ee"
@@ -2365,6 +2392,7 @@ TEST_F(DISABLED_TestKeybox, DecryptWithOffset) {
      "4bcc7bd14746304fea100dc6465ab51241355bb19e6c2cfb2bb6bbf709765d13");
  vector<uint8_t> encryptionIv = wvcdm::a2b_hex(
      "c09454479a280829c946df3c22f25539");
+  // This is the expected decrypted data.
  vector<uint8_t> unencryptedData = wvcdm::a2b_hex(
      "f344d9cfe336c94cf4e3ea9e3446d1427bc02d2debe6dec5b272b8"
      "a4004b696c4b37e01d7418510abf32bb071f9a4bc0d2ad7e874b648e50bd0e4f"
@@ -2450,6 +2478,7 @@ TEST_F(DISABLED_TestKeybox, DecryptWithNearWrap) {
  vector<uint8_t> key = wvcdm::a2b_hex("39AD33E5719656069F9EDE9EBBA7A77D");
  vector<uint8_t> encryptionIv = wvcdm::a2b_hex(
      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE");
+  // This is dummy decrypted data.
  vector<uint8_t> unencryptedData = wvcdm::a2b_hex(
      "f344d9cfe336c94cf4e3ea9e3446d1427bc02d2debe6dec5b272b8"
      "a4004b696c4b37e01d7418510abf32bb071f9a4bc0d2ad7e874b648e50bd0e4f"
@@ -2497,6 +2526,7 @@ TEST_F(DISABLED_TestKeybox, DecryptUnencrypted) {
  ASSERT_EQ(OEMCrypto_SUCCESS, sts);

  // Set up our expected input and output
+  // This is dummy decrypted data.
  vector<uint8_t> unencryptedData = wvcdm::a2b_hex(
      "1558497b6d994be343ed1c6d6313e0537b843e9a9c0836d1e83fe33154191ce9"
      "a14d8d95bebaddc03bd471827170f527c0a166b9068b273d1bc57fbb13975ee4"
@@ -2535,6 +2565,7 @@ TEST_F(DISABLED_TestKeybox, DecryptUnencryptedNoKey) {
  // CLear data should be copied even if there is no key selected.

  // Set up our expected input and output
+  // This is dummy decrypted data.
  vector<uint8_t> unencryptedData = wvcdm::a2b_hex(
      "1558497b6d994be343ed1c6d6313e0537b843e9a9c0836d1e83fe33154191ce9"
      "a14d8d95bebaddc03bd471827170f527c0a166b9068b273d1bc57fbb13975ee4"
@@ -4597,6 +4628,85 @@ TEST_P(DISABLED_UsageTableTest, EmptyTable) {
  }
 }

+TEST_P(DISABLED_UsageTableTest, FiftyEntries) {
+  if (OEMCrypto_SupportsUsageTable()) {
+    ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_UpdateUsageTable());
+    Session s1;
+    s1.open();
+    s1.GenerateDerivedKeys();
+    std::string pst1 = "pst saved";
+    s1.FillSimpleMessage(
+        0, wvoec_mock::kControlNonceEnabled | wvoec_mock::kControlNonceRequired,
+        s1.get_nonce(), pst1);
+    s1.EncryptAndSign();
+    s1.LoadTestKeys(pst1, new_mac_keys_);
+    sleep(kShortSleep);
+
+    cout << "Making 49\n";
+    const size_t ENTRY_COUNT = 49;// API says should hold at least 50 entries.
+    Session sessions[ENTRY_COUNT];
+    for (int i=0; i<ENTRY_COUNT; i++) {
+      sessions[i].open();
+      sessions[i].GenerateDerivedKeys();
+      std::string pst = "pst ";
+      char c = 'A' + i;
+      pst = pst + c;
+      sessions[i].FillSimpleMessage(
+          0, wvoec_mock::kControlNonceEnabled | wvoec_mock::kControlNonceRequired,
+          sessions[i].get_nonce(), pst);
+      sessions[i].EncryptAndSign();
+      sessions[i].LoadTestKeys(pst, new_mac_keys_);
+      sessions[i].GenerateReport(pst);
+      sessions[i].close();
+    }
+    cout << "Checking 49\n";
+    for (int i=0; i<ENTRY_COUNT; i++) {
+      Session s;
+      s.open();
+      std::string pst = "pst ";
+      char c = 'A' + i;
+      pst = pst + c;
+      s.GenerateReport(pst, true, &sessions[i]);
+      EXPECT_EQ(kUnused, s.pst_report()->status);
+      s.close();
+    }
+    sleep(kShortSleep);
+    cout << "Making another 49\n";
+    // If I add too many entries, it can delete the older ones first, except
+    // it shouldn't delete the one attached to an open session. (s1)
+    for (int i=0; i<ENTRY_COUNT; i++) {
+      sessions[i].open();
+      sessions[i].GenerateDerivedKeys();
+      std::string pst = "newer pst ";
+      char c = 'A' + i;
+      pst = pst + c;
+      sessions[i].FillSimpleMessage(
+          0, wvoec_mock::kControlNonceEnabled | wvoec_mock::kControlNonceRequired,
+          sessions[i].get_nonce(), pst);
+      sessions[i].EncryptAndSign();
+      sessions[i].LoadTestKeys(pst, new_mac_keys_);
+      sessions[i].GenerateReport(pst);
+      sessions[i].close();
+    }
+    cout << "Checking another 49\n";
+    for (int i=0; i<49; i++) {
+      Session s;
+      s.open();
+      std::string pst = "newer pst ";
+      char c = 'A' + i;
+      pst = pst + c;
+      s.GenerateReport(pst, true, &sessions[i]);
+      EXPECT_EQ(kUnused, s.pst_report()->status);
+      s.close();
+    }
+    s1.close();
+    s1.open();  // Make sure s1's entry is still in the table.
+    s1.GenerateReport(pst1);
+    EXPECT_EQ(kUnused, s1.pst_report()->status);
+    s1.close();
+  }
+}
+
 TEST_P(DISABLED_UsageTableTest, DeleteUnusedEntry) {
  if (OEMCrypto_SupportsUsageTable()) {
    ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_UpdateUsageTable());
@@ -5157,21 +5267,24 @@ TEST_P(DISABLED_UsageTableTest, TimingTest) {
    Session s1;
    Session s2;
    Session s3;
-    time_t loaded = time(NULL);
    LoadOfflineLicense(s1, pst1);
+    time_t loaded1 = time(NULL);
    LoadOfflineLicense(s2, pst2);
+    time_t loaded2 = time(NULL);
    LoadOfflineLicense(s3, pst3);
+    time_t loaded3 = time(NULL);

    sleep(kLongSleep);
-    time_t first_decrypt = time(NULL);
    s1.open();
    s1.GenerateDerivedKeys();
    s1.LoadTestKeys(pst1, new_mac_keys_);
+    time_t first_decrypt1 = time(NULL);
    s1.TestDecryptCTR();

    s2.open();
    s2.GenerateDerivedKeys();
    s2.LoadTestKeys(pst2, new_mac_keys_);
+    time_t first_decrypt2 = time(NULL);
    s2.TestDecryptCTR();

    sleep(kLongSleep);
@@ -5204,34 +5317,36 @@ TEST_P(DISABLED_UsageTableTest, TimingTest) {
    s2.open();
    s3.open();
    sleep(kLongSleep);
-    time_t report_generated = time(NULL);
+    time_t report_generated1 = time(NULL);
    s1.GenerateReport(pst1);
+    time_t report_generated2 = time(NULL);
    s2.GenerateReport(pst2);
+    time_t report_generated3 = time(NULL);
    s3.GenerateReport(pst3);

    EXPECT_EQ(kInactive, s1.pst_report()->status);
    EXPECT_ALMOST(
-        report_generated - loaded,
+        report_generated1 - loaded1,
        wvcdm::htonll64(s1.pst_report()->seconds_since_license_received));
    EXPECT_ALMOST(
-        report_generated - first_decrypt,
+        report_generated1 - first_decrypt1,
        wvcdm::htonll64(s1.pst_report()->seconds_since_first_decrypt));
-    EXPECT_ALMOST(report_generated - second_decrypt,
+    EXPECT_ALMOST(report_generated1 - second_decrypt,
                  wvcdm::htonll64(s1.pst_report()->seconds_since_last_decrypt));

    EXPECT_EQ(kActive, s2.pst_report()->status);
    EXPECT_ALMOST(
-        report_generated - loaded,
+        report_generated2 - loaded2,
        wvcdm::htonll64(s2.pst_report()->seconds_since_license_received));
    EXPECT_ALMOST(
-        report_generated - first_decrypt,
+        report_generated2 - first_decrypt2,
        wvcdm::htonll64(s2.pst_report()->seconds_since_first_decrypt));
-    EXPECT_ALMOST(report_generated - third_decrypt,
+    EXPECT_ALMOST(report_generated2 - third_decrypt,
                  wvcdm::htonll64(s2.pst_report()->seconds_since_last_decrypt));

    EXPECT_EQ(kUnused, s3.pst_report()->status);
    EXPECT_ALMOST(
-        report_generated - loaded,
+        report_generated3 - loaded3,
        wvcdm::htonll64(s3.pst_report()->seconds_since_license_received));
    // We don't expect first or last decrypt for unused report.
  }