Merges to android Pi release (part 5)

These are a set of CLs merged from the wv cdm repo to the android repo. * Change build options for make protobuf host tools Author: Gene Morgan <gmorgan@google.com> [ Merge of http://go/wvgerrit/30381 ] Also revert local change to protobuf/extension_set.cc This builds after adding -Wno-return-type and -Wno-unused flags. * OEMCrypto v13 stub Author: Rintaro Kuroiwa <rkuroiwa@google.com> [ Merge of http://go/wvgerrit/30004 ] * Remove merge conflict tags Author: Edwin Wong <edwinwong@google.com> [ Merge of http://go/wvgerrit/30120 ] Remove merge conflict tags for http://go/wvgerrit/29880 * Added Android Things ARM provisioning key to L3 Author: Srujan Gaddam <srujzs@google.com> [ Merge of http://go/wvgerrit/29701 ] BUG: 63443584 BUG: 71650075 Test: Not currently passing. Will be addressed in a subsequent commit in the chain. Change-Id: Ifd867b491dfda5d67d2e225695535b5af9e18260
2018-01-09 18:03:56 -08:00
parent 169d0b6cb6
commit b7c9ad57c9
24 changed files with 1852 additions and 1129 deletions
--- a/libwvdrmengine/cdm/test/Android.mk
+++ b/libwvdrmengine/cdm/test/Android.mk
@@ -71,6 +71,10 @@ test_name := timer_unittest
 test_src_dir := .
 include $(LOCAL_PATH)/unit-test.mk

+test_name := usage_table_header_unittest
+test_src_dir := ../core/test
+include $(LOCAL_PATH)/unit-test.mk
+
 test_name := distribution_test
 test_src_dir := ../metrics/test
 include $(LOCAL_PATH)/unit-test.mk
--- a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
+++ b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
@@ -983,6 +983,142 @@ TEST_F(WvCdmExtendedDurationTest, UsageOverflowTest) {
  }
 }

+// This test verifies that sessions allocated internally during key release
+// message generation are deallocated after their time to live period expires
+// by timer events (if other sessions are open).
+TEST_F(WvCdmExtendedDurationTest, AutomatedOfflineSessionReleaseOnTimerEvent) {
+  Unprovision();
+  Provision();
+
+  // Leave session open to run the CDM timer
+  CdmSessionId streaming_session_id;
+  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
+                         &streaming_session_id);
+
+  // override default settings unless configured through the command line
+  std::string key_id;
+  std::string client_auth;
+  GetOfflineConfiguration(&key_id, &client_auth);
+
+  uint32_t initial_open_sessions =
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS);
+
+  uint32_t max_sessions =
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_MAX_NUMBER_OF_SESSIONS);
+
+  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
+                         &session_id_);
+  GenerateKeyRequest(kOfflineClip4, kLicenseTypeOffline);
+  VerifyKeyRequestResponse(kUatLicenseServer, client_auth, false);
+
+  EXPECT_FALSE(key_set_id_.empty());
+  decryptor_.CloseSession(session_id_);
+  CdmKeySetId key_set_id = key_set_id_;
+
+  session_id_.clear();
+  key_set_id_.clear();
+  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
+                         &session_id_);
+  EXPECT_EQ(wvcdm::KEY_ADDED, decryptor_.RestoreKey(session_id_, key_set_id));
+  decryptor_.CloseSession(session_id_);
+
+  session_id_.clear();
+  GenerateKeyRelease(key_set_id);
+
+  uint32_t open_sessions =
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS);
+
+  EXPECT_GT(open_sessions, initial_open_sessions);
+
+  sleep(kMinute + kClockTolerance);
+
+  open_sessions =
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS);
+
+  EXPECT_EQ(open_sessions, initial_open_sessions);
+
+  session_id_.clear();
+  GenerateKeyRelease(key_set_id);
+  key_set_id_ = key_set_id;
+  VerifyKeyRequestResponse(kUatLicenseServer, client_auth, false);
+  decryptor_.CloseSession(streaming_session_id);
+}
+
+// This test verifies that sessions allocated internally during key release
+// message generation are deallocated after their time to live period expires
+// when a new session is opened.
+TEST_F(WvCdmExtendedDurationTest, AutomatedOfflineSessionReleaseOnOpenSession) {
+  Unprovision();
+  Provision();
+
+  // override default settings unless configured through the command line
+  std::string key_id;
+  std::string client_auth;
+  GetOfflineConfiguration(&key_id, &client_auth);
+
+  uint32_t initial_open_sessions =
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS);
+
+  uint32_t max_sessions =
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_MAX_NUMBER_OF_SESSIONS);
+
+  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
+                         &session_id_);
+  GenerateKeyRequest(kOfflineClip4, kLicenseTypeOffline);
+  VerifyKeyRequestResponse(kUatLicenseServer, client_auth, false);
+
+  EXPECT_FALSE(key_set_id_.empty());
+  decryptor_.CloseSession(session_id_);
+  CdmKeySetId key_set_id = key_set_id_;
+
+  session_id_.clear();
+  key_set_id_.clear();
+  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
+                         &session_id_);
+  EXPECT_EQ(wvcdm::KEY_ADDED, decryptor_.RestoreKey(session_id_, key_set_id));
+  decryptor_.CloseSession(session_id_);
+
+  session_id_.clear();
+  GenerateKeyRelease(key_set_id);
+
+  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
+                         &session_id_);
+
+  EXPECT_GT(
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS),
+      initial_open_sessions);
+
+  decryptor_.CloseSession(session_id_);
+
+  EXPECT_GT(
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS),
+      initial_open_sessions);
+
+  sleep(kMinute + kClockTolerance);
+
+  EXPECT_GT(
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS),
+      initial_open_sessions);
+
+  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
+                         &session_id_);
+
+  EXPECT_GT(
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS),
+      initial_open_sessions);
+
+  decryptor_.CloseSession(session_id_);
+
+  EXPECT_EQ(
+      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS),
+      initial_open_sessions);
+
+  session_id_.clear();
+  GenerateKeyRelease(key_set_id);
+  key_set_id_ = key_set_id;
+  VerifyKeyRequestResponse(kUatLicenseServer, client_auth, false);
+}
+
 // This test verifies that sessions allocated internally during
 // key release message generation are deallocated after their
 // time to live period expires.
--- a/libwvdrmengine/cdm/test/request_license_test.cpp
+++ b/libwvdrmengine/cdm/test/request_license_test.cpp
@@ -986,7 +986,7 @@ class TestWvCdmHlsEventListener : public WvCdmEventListener {

 class WvCdmRequestLicenseTest : public WvCdmTestBase {
 public:
-  WvCdmRequestLicenseTest() {}
+  WvCdmRequestLicenseTest() : license_type_(kLicenseTypeStreaming) {}
  ~WvCdmRequestLicenseTest() {}

 protected:
@@ -1032,6 +1032,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
                          CdmClientPropertySet* property_set) {
    CdmKeyRequest key_request;
    std::string key_set_id;
+    license_type_ = license_type;
    EXPECT_EQ(expected_response,
              decryptor_.GenerateKeyRequest(
                  session_id_, key_set_id, init_data_type, init_data,
@@ -1075,6 +1076,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
  void GenerateKeyRelease(CdmKeySetId key_set_id,
                          CdmClientPropertySet* property_set,
                          CdmKeyMessage* key_msg) {
+    license_type_ = kLicenseTypeRelease;
    CdmSessionId session_id;
    CdmInitData init_data;
    wvcdm::CdmAppParameterMap app_parameters;
@@ -1168,26 +1170,34 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
  }

  void VerifyKeyRequestResponse(const std::string& server_url,
-                                const std::string& client_auth,
-                                bool is_renewal) {
+                                const std::string& client_auth) {
    std::string response;
-    VerifyKeyRequestResponse(server_url, client_auth, is_renewal, &response);
+    VerifyKeyRequestResponse(server_url, client_auth, false);
+  }
+
+  void VerifyUsageKeyRequestResponse(const std::string& server_url,
+                                     const std::string& client_auth) {
+    std::string response;
+    VerifyKeyRequestResponse(server_url, client_auth, true);
  }

  void VerifyKeyRequestResponse(const std::string& server_url,
-                                const std::string& client_auth, bool is_renewal,
+                                const std::string& client_auth,
+                                bool is_usage) {
+    std::string response;
+    VerifyKeyRequestResponse(server_url, client_auth, is_usage, &response);
+  }
+
+  void VerifyKeyRequestResponse(const std::string& server_url,
+                                const std::string& client_auth,
+                                bool is_usage,
                                std::string* response) {
    *response = GetKeyRequestResponse(server_url, client_auth);

-    if (is_renewal) {
-      // TODO application makes a license request, CDM will renew the license
-      // when appropriate
-      EXPECT_EQ(decryptor_.AddKey(session_id_, *response, &key_set_id_),
-                wvcdm::KEY_ADDED);
-    } else {
-      EXPECT_EQ(decryptor_.AddKey(session_id_, *response, &key_set_id_),
-                wvcdm::KEY_ADDED);
-    }
+    EXPECT_EQ(decryptor_.AddKey(session_id_, *response, &key_set_id_),
+              wvcdm::KEY_ADDED);
+    EXPECT_EQ(is_usage || license_type_ == kLicenseTypeOffline,
+              key_set_id_.size() > 0);
  }

  void Unprovision() {
@@ -1295,6 +1305,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
  CdmKeyMessage key_msg_;
  CdmSessionId session_id_;
  CdmKeySetId key_set_id_;
+  CdmLicenseType license_type_;
 };

 TEST_F(WvCdmRequestLicenseTest, ProvisioningTest) {
@@ -1608,7 +1619,7 @@ TEST_F(WvCdmRequestLicenseTest, ForceL3Test) {
                                             kDefaultCdmIdentifier, NULL,
                                             &session_id_));
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -1624,7 +1635,7 @@ TEST_F(WvCdmRequestLicenseTest, PrivacyModeTest) {
  EXPECT_EQ(decryptor_.AddKey(session_id_, resp, &key_set_id_),
            wvcdm::NEED_KEY);
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -1637,7 +1648,7 @@ TEST_F(WvCdmRequestLicenseTest, PrivacyModeWithServiceCertificateTest) {
  decryptor_.OpenSession(g_key_system, &property_set, kDefaultCdmIdentifier,
                         NULL, &session_id_);
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -1682,7 +1693,7 @@ TEST_F(WvCdmRequestLicenseTest, AddStreamingKeyTest) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -1698,7 +1709,7 @@ TEST_F(WvCdmRequestLicenseTest, AddKeyOfflineTest) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -1714,7 +1725,7 @@ TEST_F(WvCdmRequestLicenseTest, RestoreOfflineKeyTest) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);

  CdmKeySetId key_set_id = key_set_id_;
  EXPECT_FALSE(key_set_id_.empty());
@@ -1739,7 +1750,7 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseOfflineKeyTest) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);

  CdmKeySetId key_set_id = key_set_id_;
  EXPECT_FALSE(key_set_id_.empty());
@@ -1756,7 +1767,7 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseOfflineKeyTest) {
  key_set_id_.clear();
  GenerateKeyRelease(key_set_id);
  key_set_id_ = key_set_id;
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);
 }

 TEST_F(WvCdmRequestLicenseTest, ReleaseOfflineKeySessionUsageDisabledTest) {
@@ -1775,7 +1786,7 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseOfflineKeySessionUsageDisabledTest) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);

  CdmKeySetId key_set_id = key_set_id_;
  EXPECT_FALSE(key_set_id_.empty());
@@ -1793,7 +1804,7 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseOfflineKeySessionUsageDisabledTest) {
  CdmKeyMessage key_msg;
  GenerateKeyRelease(key_set_id, NULL, &key_msg);
  key_set_id_ = key_set_id;
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);

  SignedMessage signed_message;
  EXPECT_TRUE(signed_message.ParseFromString(key_msg));
@@ -1830,7 +1841,7 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseRetryOfflineKeyTest) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);

  CdmKeySetId key_set_id = key_set_id_;
  EXPECT_FALSE(key_set_id_.empty());
@@ -1858,7 +1869,7 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseRetryOfflineKeyTest) {
  key_set_id_.clear();
  GenerateKeyRelease(key_set_id);
  key_set_id_ = key_set_id;
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);
 }

 TEST_F(WvCdmRequestLicenseTest, ReleaseRetryL3OfflineKeyTest) {
@@ -1900,7 +1911,7 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseRetryL3OfflineKeyTest) {
  decryptor_.OpenSession(g_key_system, &property_set, kDefaultCdmIdentifier,
                         NULL, &session_id_);
  GenerateKeyRequest(key_id, kLicenseTypeOffline, &property_set);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);

  CdmKeySetId key_set_id = key_set_id_;
  EXPECT_FALSE(key_set_id_.empty());
@@ -1928,7 +1939,7 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseRetryL3OfflineKeyTest) {
  key_set_id_.clear();
  GenerateKeyRelease(key_set_id, &property_set, NULL);
  key_set_id_ = key_set_id;
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);
 }

 TEST_F(WvCdmRequestLicenseTest, ExpiryOnReleaseOfflineKeyTest) {
@@ -1943,7 +1954,7 @@ TEST_F(WvCdmRequestLicenseTest, ExpiryOnReleaseOfflineKeyTest) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);

  CdmKeySetId key_set_id = key_set_id_;
  EXPECT_FALSE(key_set_id_.empty());
@@ -1976,7 +1987,7 @@ TEST_F(WvCdmRequestLicenseTest, ExpiryOnReleaseOfflineKeyTest) {
          AllOf(Each(Pair(_, kKeyStatusExpired)), Not(IsEmpty())), false));
  GenerateKeyRelease(key_set_id);
  key_set_id_ = key_set_id;
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);
  decryptor_.CloseSession(restore_session_id);
 }

@@ -1995,7 +2006,7 @@ TEST_F(WvCdmRequestLicenseTest, AutomatedOfflineSessionReleaseTest) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);

  CdmKeySetId key_set_id = key_set_id_;
  EXPECT_FALSE(key_set_id_.empty());
@@ -2029,7 +2040,7 @@ TEST_F(WvCdmRequestLicenseTest, AutomatedOfflineSessionReleaseTest) {
      open_sessions,
      QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS));

-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);

  EXPECT_EQ(
      --open_sessions,
@@ -2040,12 +2051,12 @@ TEST_F(WvCdmRequestLicenseTest, StreamingLicenseRenewal) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);

  std::string license_server;
  GenerateRenewalRequest(kLicenseTypeStreaming, &license_server);
  if (license_server.empty()) license_server = g_license_server;
-  VerifyKeyRequestResponse(license_server, g_client_auth, true);
+  VerifyKeyRequestResponse(license_server, g_client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -2058,7 +2069,7 @@ TEST_F(WvCdmRequestLicenseTest, StreamingLicenseRenewalProhibited) {
      "08011a0d7769646576696e655f746573"          // pssh data
      "74221073747265616d696e675f636c69703131");
  GenerateKeyRequest(key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);

  std::string init_data;
  wvcdm::CdmAppParameterMap app_parameters;
@@ -2084,12 +2095,12 @@ TEST_F(WvCdmRequestLicenseTest, OfflineLicenseRenewal) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);

  std::string license_server;
  GenerateRenewalRequest(kLicenseTypeOffline, &license_server);
  if (license_server.empty()) license_server = g_license_server;
-  VerifyKeyRequestResponse(license_server, client_auth, true);
+  VerifyKeyRequestResponse(license_server, client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -2098,7 +2109,7 @@ TEST_F(WvCdmRequestLicenseTest, RemoveKeys) {
                                             kDefaultCdmIdentifier, NULL,
                                             &session_id_));
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);
  ASSERT_EQ(NO_ERROR, decryptor_.RemoveKeys(session_id_));
  ASSERT_EQ(NO_ERROR, decryptor_.CloseSession(session_id_));
 }
@@ -2217,7 +2228,7 @@ TEST_P(WvCdmStreamingLicenseRenewalTest, WithClientId) {
        0u, license_renewal.encrypted_client_id().encrypted_client_id().size());
  }

-  VerifyKeyRequestResponse(license_server, g_client_auth, true);
+  VerifyKeyRequestResponse(license_server, g_client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -2359,7 +2370,7 @@ TEST_P(WvCdmOfflineLicenseReleaseTest, WithClientId) {
        0u, license_release.encrypted_client_id().encrypted_client_id().size());
  }

-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -2414,7 +2425,7 @@ TEST_P(WvCdmUsageTest, WithClientId) {
                     &property_set);

  std::string key_response;
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false,
+  VerifyKeyRequestResponse(g_license_server, g_client_auth, true,
                           &key_response);

  // Validate signed license
@@ -2519,7 +2530,7 @@ TEST_F(WvCdmRequestLicenseTest, UsageInfoRetryTest) {
      "747265616d696e675f636c697033");

  GenerateKeyRequest(key_id, kLicenseTypeStreaming, NULL);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyUsageKeyRequestResponse(g_license_server, g_client_auth);

  std::vector<uint8_t> decrypt_buffer(data->encrypt_data.size());
  CdmDecryptionParameters decryption_parameters(
@@ -2611,7 +2622,12 @@ TEST_P(WvCdmUsageInfoTest, UsageInfo) {
    key_id.append(1, ch);

    GenerateKeyRequest(key_id, kLicenseTypeStreaming, property_set);
-    VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+
+    // TODO(rfrias): streaming_clip6 is a streaming license without a pst
+    if (ch == '6')
+      VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+    else
+      VerifyUsageKeyRequestResponse(g_license_server, g_client_auth);

    std::vector<uint8_t> decrypt_buffer(data->encrypt_data.size());
    CdmDecryptionParameters decryption_parameters(
@@ -2691,7 +2707,12 @@ TEST_F(WvCdmRequestLicenseTest, UsageReleaseAllTest) {
    key_id.append(1, ch);

    GenerateKeyRequest(key_id, kLicenseTypeStreaming, &property_set);
-    VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+
+    // TODO(rfrias): streaming_clip6 is a streaming license without a pst
+    if (ch == '6')
+      VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+    else
+      VerifyUsageKeyRequestResponse(g_license_server, g_client_auth);

    std::vector<uint8_t> decrypt_buffer(data->encrypt_data.size());
    CdmDecryptionParameters decryption_parameters(
@@ -2779,7 +2800,7 @@ TEST_F(WvCdmRequestLicenseTest, QueryKeyStatus) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);

  CdmQueryMap query_info;
  CdmQueryMap::iterator itr;
@@ -3013,7 +3034,7 @@ TEST_F(WvCdmRequestLicenseTest, QueryOemCryptoSessionId) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);

  CdmQueryMap query_info;
  CdmQueryMap::iterator itr;
@@ -3101,7 +3122,7 @@ TEST_F(WvCdmRequestLicenseTest, SecurityLevelPathBackwardCompatibility) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);
  CdmKeySetId key_set_id = key_set_id_;
  EXPECT_FALSE(key_set_id_.empty());
  decryptor_.CloseSession(session_id_);
@@ -3140,7 +3161,7 @@ TEST_F(WvCdmRequestLicenseTest, SecurityLevelPathBackwardCompatibility) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);
  decryptor_.CloseSession(session_id_);

  if (security_level != kSecurityLevelL1) return;
@@ -3165,7 +3186,7 @@ TEST_F(WvCdmRequestLicenseTest, SecurityLevelPathBackwardCompatibility) {
                                             kDefaultCdmIdentifier, NULL,
                                             &session_id_));
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -3173,7 +3194,7 @@ TEST_F(WvCdmRequestLicenseTest, DISABLED_OfflineLicenseDecryptionTest) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(g_key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);

  /*
    // key 1, encrypted, 256b
@@ -3227,7 +3248,7 @@ TEST_F(WvCdmRequestLicenseTest, DISABLED_RestoreOfflineLicenseDecryptionTest) {
  decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL,
                         &session_id_);
  GenerateKeyRequest(g_key_id, kLicenseTypeOffline);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);
  CdmKeySetId key_set_id = key_set_id_;
  EXPECT_FALSE(key_set_id_.empty());
  decryptor_.CloseSession(session_id_);
@@ -3289,7 +3310,7 @@ TEST_F(WvCdmRequestLicenseTest, DISABLED_RestoreOfflineLicenseDecryptionTest) {
 TEST_F(WvCdmRequestLicenseTest, KeyControlBlockDecryptionTest) {
  decryptor_.OpenSession(g_key_system, &session_id_);
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);

  DecryptionData data;

@@ -3355,7 +3376,7 @@ TEST_P(WvCdmSessionSharingTest, SessionSharingTest) {
                         NULL, &session_id_);
  CdmSessionId gp_session_id_1 = session_id_;
  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);

  // TODO(rfrias): Move content information to ConfigTestEnv
  std::string gp_client_auth2 =
@@ -3369,7 +3390,7 @@ TEST_P(WvCdmSessionSharingTest, SessionSharingTest) {
                         NULL, &session_id_);
  CdmSessionId gp_session_id_2 = session_id_;
  GenerateKeyRequest(gp_key_id2, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, gp_client_auth2, false);
+  VerifyKeyRequestResponse(g_license_server, gp_client_auth2);

  SubSampleInfo* data = session_sharing_info->sub_sample;
  std::vector<uint8_t> decrypt_buffer(data->encrypt_data.size());
@@ -3414,7 +3435,7 @@ TEST_F(WvCdmRequestLicenseTest, SessionSharingTest) {
                         NULL, &session_id_);
  CdmSessionId session_id1 = session_id_;
  GenerateKeyRequest(init_data1, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);

  // TODO(rfrias): Move content information to ConfigTestEnv
  std::string gp_client_auth2 =
@@ -3428,7 +3449,7 @@ TEST_F(WvCdmRequestLicenseTest, SessionSharingTest) {
                         NULL, &session_id_);
  CdmSessionId session_id2 = session_id_;
  GenerateKeyRequest(init_data2, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, gp_client_auth2, false);
+  VerifyKeyRequestResponse(g_license_server, gp_client_auth2);

  SubSampleInfo* data = &single_encrypted_sub_sample_short_expiry;

@@ -3450,7 +3471,7 @@ TEST_F(WvCdmRequestLicenseTest, SessionSharingTest) {
                         NULL, &session_id_);
  CdmSessionId session_id3 = session_id_;
  GenerateKeyRequest(init_data1, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);

  EXPECT_EQ(NO_ERROR, decryptor_.Decrypt(session_id1, data->validate_key_id,
                                         decryption_parameters));
@@ -3475,7 +3496,7 @@ TEST_F(WvCdmRequestLicenseTest, DecryptionKeyExpiredTest) {
                         &session_id_);
  if (data->retrieve_key) {
    GenerateKeyRequest(kCpKeyId, kLicenseTypeStreaming);
-    VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+    VerifyKeyRequestResponse(g_license_server, g_client_auth);
  }

  std::vector<uint8_t> decrypt_buffer(data->encrypt_data.size());
@@ -3516,7 +3537,7 @@ TEST_F(WvCdmRequestLicenseTest, SessionKeyChangeNotificationTest) {
      "0801121030313233343536373839616263646566");  // pssh data

  GenerateKeyRequest(kCpKeyId, kLicenseTypeStreaming);
-  VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(g_license_server, g_client_auth);

  decryptor_.CloseSession(session_id_);
 }
@@ -3531,7 +3552,7 @@ TEST_P(WvCdmDecryptionTest, DecryptionTest) {
                         &session_id_);
  if (data->retrieve_key) {
    GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
-    VerifyKeyRequestResponse(g_license_server, g_client_auth, false);
+    VerifyKeyRequestResponse(g_license_server, g_client_auth);
  }

  uint32_t decrypt_sample_buffer_size = 0;
@@ -3574,6 +3595,59 @@ INSTANTIATE_TEST_CASE_P(Cdm, WvCdmDecryptionTest,
                                          &switch_key_encrypted_sub_samples[0],
                                          &partial_encrypted_sub_samples[0]));

+class WvCdmSessionSharingNoKeyTest
+    : public WvCdmRequestLicenseTest,
+      public ::testing::WithParamInterface<SubSampleInfo*> {};
+
+TEST_P(WvCdmSessionSharingNoKeyTest, DecryptionTest) {
+  SubSampleInfo* data = GetParam();
+
+  TestWvCdmClientPropertySet property_set;
+  property_set.set_session_sharing_mode(true);
+
+  decryptor_.OpenSession(g_key_system, &property_set, kDefaultCdmIdentifier,
+                         NULL, &session_id_);
+  CdmSessionId gp_session_id_1 = session_id_;
+  GenerateKeyRequest(g_key_id, kLicenseTypeStreaming);
+
+  // TODO(rfrias): Move content information to ConfigTestEnv
+  std::string gp_client_auth2 =
+      "?source=YOUTUBE&video_id=z3S_NhwueaM&oauth=ya.gtsqawidevine";
+  std::string gp_key_id2 = wvcdm::a2bs_hex(
+      "000000347073736800000000"                    // blob size and pssh
+      "edef8ba979d64acea3c827dcd51d21ed00000014"    // Widevine system id
+      "08011210bdf1cb4fffc6506b8b7945b0bd2917fb");  // pssh data
+
+  decryptor_.OpenSession(g_key_system, &property_set, kDefaultCdmIdentifier,
+                         NULL, &session_id_);
+  CdmSessionId gp_session_id_2 = session_id_;
+  GenerateKeyRequest(gp_key_id2, kLicenseTypeStreaming);
+
+  std::vector<uint8_t> decrypt_buffer(data->encrypt_data.size());
+  CdmDecryptionParameters decryption_parameters(
+      &data->key_id, &data->encrypt_data.front(), data->encrypt_data.size(),
+      &data->iv, data->block_offset, &decrypt_buffer[0]);
+  decryption_parameters.is_encrypted = data->is_encrypted;
+  decryption_parameters.is_secure = data->is_secure;
+  decryption_parameters.subsample_flags = data->subsample_flags;
+
+    EXPECT_EQ(data->is_encrypted ? KEY_NOT_FOUND_IN_SESSION : NO_ERROR,
+              decryptor_.Decrypt(gp_session_id_2, data->validate_key_id,
+                                 decryption_parameters));
+  if (!data->is_encrypted) {
+    EXPECT_TRUE(std::equal(data->decrypt_data.begin(), data->decrypt_data.end(),
+                           decrypt_buffer.begin()));
+  }
+
+  decryptor_.CloseSession(gp_session_id_1);
+  decryptor_.CloseSession(gp_session_id_2);
+}
+
+INSTANTIATE_TEST_CASE_P(Cdm, WvCdmSessionSharingNoKeyTest,
+                        ::testing::Values(&clear_sub_sample,
+                                          &clear_sub_sample_no_key,
+                                          &single_encrypted_sub_sample));
+
 TEST(VersionNumberTest, VersionNumberChangeCanary) {
  char release_number[PROPERTY_VALUE_MAX];
  ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"),
@@ -3599,7 +3673,7 @@ TEST_F(WvCdmRequestLicenseTest, AddHlsStreamingKeyTest) {
                     kLicenseTypeStreaming, NULL);
  //TODO(rfrias): Remove once we switch to git-on-borg
  std::string license_server = "https://proxy.uat.widevine.com/proxy";
-  VerifyKeyRequestResponse(license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(license_server, g_client_auth);
  decryptor_.CloseSession(session_id_);
 }

@@ -3643,7 +3717,7 @@ TEST_P(WvHlsDecryptionTest, HlsDecryptionTest) {
                     kLicenseTypeStreaming, NULL);
  //TODO(rfrias): Remove once we switch to git-on-borg
  std::string license_server = "https://proxy.uat.widevine.com/proxy";
-  VerifyKeyRequestResponse(license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(license_server, g_client_auth);
  CdmKeyStatusMap key_status_map = listener.GetKeyStatusMap();
  EXPECT_EQ(1u, key_status_map.size());
  KeyId key_id = key_status_map.begin()->first;
@@ -3697,7 +3771,7 @@ TEST_P(WvHlsFourCCBackwardCompatibilityTest, HlsDecryptionTest) {
                     kLicenseTypeStreaming, NULL);
  //TODO(rfrias): Remove once we switch to git-on-borg
  std::string license_server = "https://proxy.uat.widevine.com/proxy";
-  VerifyKeyRequestResponse(license_server, g_client_auth, false);
+  VerifyKeyRequestResponse(license_server, g_client_auth);
  CdmKeyStatusMap key_status_map = listener.GetKeyStatusMap();
  EXPECT_EQ(1u, key_status_map.size());
  KeyId key_id = key_status_map.begin()->first;