From bd45d4f0fad801e57d074fe51275a1c583d8c275 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Fri, 19 Jan 2018 17:10:33 -0800 Subject: [PATCH] Allow use of cached initialization data [ Merge of http://go/wvgerrit/41340 ] An initial license request may actually result in a service certificate request. Once the service certificate has been successfully handled, an app may make a license request without needing to provide the initialization data again. This behavior was broken in a recent merge. Correcting the test as well. b/72182032 Test: Ran wv unit/integration tests Change-Id: I82401b9a3bf38140706dad859b4ae241b7ddac12 --- libwvdrmengine/cdm/core/src/cdm_session.cpp | 2 +- libwvdrmengine/cdm/test/request_license_test.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/cdm_session.cpp b/libwvdrmengine/cdm/core/src/cdm_session.cpp index 67cea885..15b25bee 100644 --- a/libwvdrmengine/cdm/core/src/cdm_session.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp @@ -372,7 +372,7 @@ CdmResponseType CdmSession::GenerateKeyRequest( init_data.type().c_str()); return UNSUPPORTED_INIT_DATA; } - if (init_data.IsEmpty()) { + if (init_data.IsEmpty() && !license_parser_->HasInitData()) { LOGW("CdmSession::GenerateKeyRequest: init data absent"); return INIT_DATA_NOT_FOUND; } diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index 270c5e0a..90a2029d 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -1639,7 +1639,10 @@ TEST_F(WvCdmRequestLicenseTest, PrivacyModeTest) { std::string resp = GetKeyRequestResponse(g_license_server, g_client_auth); EXPECT_EQ(decryptor_.AddKey(session_id_, resp, &key_set_id_), wvcdm::NEED_KEY); - GenerateKeyRequest(g_key_id, kLicenseTypeStreaming); + const std::string empty_init_data; + // Verify cached initialization data from previous request is used when + // empty initialization data is passed. + GenerateKeyRequest(empty_init_data, kLicenseTypeStreaming); VerifyKeyRequestResponse(g_license_server, g_client_auth); decryptor_.CloseSession(session_id_); }