From cbc1fba713e8c163bd6fdda80355a1b15306970c Mon Sep 17 00:00:00 2001 From: Alex Dale Date: Fri, 21 Jun 2019 15:22:16 -0700 Subject: [PATCH] Log cleanup and reformatting for core/ (part 1) Merge from Widevine repo of http://go/wvgerrit/81265 Types of cleanup: - Removed function / class prefixes from the logs. - Fixed log string format options to match the types passed - Added static_cast conversion on enumerations - _Tried_ to make the log format more consistent (open to feedback) - Corrected small spelling mistakes This set of changes is very large, splitting change across several submissions. This change: - core/src/buffer_reader.cpp - core/src/cdm_engine.cpp - core/src/cdm_session.cpp Test: WV linux unittests Bug: 134460638 Change-Id: I16c3297b8e94a99c2b8650b129d0f9e8d96b177f --- libwvdrmengine/cdm/core/src/buffer_reader.cpp | 50 +- libwvdrmengine/cdm/core/src/cdm_engine.cpp | 467 ++++++++---------- libwvdrmengine/cdm/core/src/cdm_session.cpp | 129 ++--- 3 files changed, 277 insertions(+), 369 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/buffer_reader.cpp b/libwvdrmengine/cdm/core/src/buffer_reader.cpp index b3423676..875e0f5d 100644 --- a/libwvdrmengine/cdm/core/src/buffer_reader.cpp +++ b/libwvdrmengine/cdm/core/src/buffer_reader.cpp @@ -11,16 +11,12 @@ namespace wvcdm { bool BufferReader::Read1(uint8_t* v) { if (v == NULL) { - LOGE( - "BufferReader::Read1 : Failure during parse: Null output parameter " - "when expecting non-null"); + LOGE("Parse failure: Null output parameter when expecting non-null"); return false; } if (!HasBytes(1)) { - LOGV( - "BufferReader::Read1 : Failure while parsing: " - "Not enough bytes (1)"); + LOGV("Parse failure: No bytes available"); return false; } @@ -32,18 +28,13 @@ bool BufferReader::Read1(uint8_t* v) { template bool BufferReader::Read(T* v) { if (v == NULL) { - LOGE( - "BufferReader::Read : Failure during parse: Null output parameter " - "when expecting non-null (%s)", - __PRETTY_FUNCTION__); + LOGE("Parse failure: Null output parameter when expecting non-null (%s)", + __PRETTY_FUNCTION__); return false; } if (!HasBytes(sizeof(T))) { - LOGV( - "BufferReader::Read : Failure during parse: " - "Not enough bytes (%u)", - sizeof(T)); + LOGV("Parse failure: Not enough bytes (%zu)", sizeof(T)); return false; } @@ -65,17 +56,12 @@ bool BufferReader::Read8s(int64_t* v) { return Read(v); } bool BufferReader::ReadString(std::string* str, size_t count) { if (str == NULL) { - LOGE( - "BufferReader::ReadString : Failure during parse: Null output " - "parameter when expecting non-null"); + LOGE("Parse failure: Null output parameter when expecting non-null"); return false; } if (!HasBytes(count)) { - LOGV( - "BufferReader::ReadString : Parse Failure: " - "Not enough bytes (%d)", - count); + LOGV("Parse failure: Not enough bytes (%zu)", count); return false; } @@ -86,17 +72,12 @@ bool BufferReader::ReadString(std::string* str, size_t count) { bool BufferReader::ReadVec(std::vector* vec, size_t count) { if (vec == NULL) { - LOGE( - "BufferReader::ReadVec : Failure during parse: Null output parameter " - "when expecting non-null"); + LOGE("Parse failure: Null output parameter when expecting non-null"); return false; } if (!HasBytes(count)) { - LOGV( - "BufferReader::ReadVec : Parse Failure: " - "Not enough bytes (%d)", - count); + LOGV("Parse failure: Not enough bytes (%zu)", count); return false; } @@ -108,10 +89,7 @@ bool BufferReader::ReadVec(std::vector* vec, size_t count) { bool BufferReader::SkipBytes(size_t bytes) { if (!HasBytes(bytes)) { - LOGV( - "BufferReader::SkipBytes : Parse Failure: " - "Not enough bytes (%d)", - bytes); + LOGV("Parse failure: Not enough bytes (%zu)", bytes); return false; } @@ -121,9 +99,7 @@ bool BufferReader::SkipBytes(size_t bytes) { bool BufferReader::Read4Into8(uint64_t* v) { if (v == NULL) { - LOGE( - "BufferReader::Read4Into8 : Failure during parse: Null output " - "parameter when expecting non-null"); + LOGE("Parse failure: Null output parameter when expecting non-null"); return false; } @@ -137,9 +113,7 @@ bool BufferReader::Read4Into8(uint64_t* v) { bool BufferReader::Read4sInto8s(int64_t* v) { if (v == NULL) { - LOGE( - "BufferReader::Read4sInto8s : Failure during parse: Null output " - "parameter when expecting non-null"); + LOGE("Parse failure: Null output parameter when expecting non-null"); return false; } diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp index abea390c..51a9398b 100644 --- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp @@ -117,15 +117,15 @@ CdmResponseType CdmEngine::OpenSession(const CdmKeySystem& key_system, WvCdmEventListener* event_listener, const CdmSessionId* forced_session_id, CdmSessionId* session_id) { - LOGI("CdmEngine::OpenSession"); + LOGI("Opening session"); if (!ValidateKeySystem(key_system)) { - LOGI("CdmEngine::OpenSession: invalid key_system = %s", key_system.c_str()); + LOGI("Invalid key system: %s", key_system.c_str()); return INVALID_KEY_SYSTEM; } if (!session_id && !forced_session_id) { - LOGE("CdmEngine::OpenSession: no (forced/)session ID destination provided"); + LOGE("No (forced/)session ID destination provided"); return PARAMETER_NULL; } @@ -148,12 +148,12 @@ CdmResponseType CdmEngine::OpenSession(const CdmKeySystem& key_system, // Reserve a session ID so the CDM can return success. if (session_id) *session_id = new_session->GenerateSessionId(); } else { - LOGE("CdmEngine::OpenSession: bad session init: %d", sts); + LOGE("Bad session init: status = %d", static_cast(sts)); } return sts; } CdmSessionId id = new_session->session_id(); - LOGI("CdmEngine::OpenSession: %s", id.c_str()); + LOGI("New session ID: %s", id.c_str()); std::unique_lock lock(session_map_lock_); session_map_.Add(id, new_session.release()); @@ -164,10 +164,10 @@ CdmResponseType CdmEngine::OpenSession(const CdmKeySystem& key_system, CdmResponseType CdmEngine::OpenKeySetSession( const CdmKeySetId& key_set_id, CdmClientPropertySet* property_set, WvCdmEventListener* event_listener) { - LOGI("CdmEngine::OpenKeySetSession: %s", key_set_id.c_str()); + LOGI("Opening key set session: key_set_id = %s", key_set_id.c_str()); if (key_set_id.empty()) { - LOGE("CdmEngine::OpenKeySetSession: invalid key set id"); + LOGE("Invalid key set ID"); return EMPTY_KEYSET_ID_ENG_1; } @@ -195,10 +195,10 @@ CdmResponseType CdmEngine::OpenKeySetSession( } CdmResponseType CdmEngine::CloseSession(const CdmSessionId& session_id) { - LOGI("CdmEngine::CloseSession: %s", session_id.c_str()); + LOGI("Closing session: session_id = %s", session_id.c_str()); std::unique_lock lock(session_map_lock_); if (!session_map_.CloseSession(session_id)) { - LOGE("CdmEngine::CloseSession: session not found = %s", session_id.c_str()); + LOGE("Session not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_1; } metrics_->ConsolidateSessions(); @@ -206,15 +206,14 @@ CdmResponseType CdmEngine::CloseSession(const CdmSessionId& session_id) { } CdmResponseType CdmEngine::CloseKeySetSession(const CdmKeySetId& key_set_id) { - LOGI("CdmEngine::CloseKeySetSession: %s", key_set_id.c_str()); + LOGI("Closing key set session: key_set_id = %s", key_set_id.c_str()); CdmSessionId session_id; { std::unique_lock lock(release_key_sets_lock_); CdmReleaseKeySetMap::iterator iter = release_key_sets_.find(key_set_id); if (iter == release_key_sets_.end()) { - LOGE("CdmEngine::CloseKeySetSession: key set id not found = %s", - key_set_id.c_str()); + LOGE("Key set ID not found: %s", key_set_id.c_str()); return KEYSET_ID_NOT_FOUND_1; } session_id = iter->second.first; @@ -239,7 +238,7 @@ CdmResponseType CdmEngine::GenerateKeyRequest( const CdmSessionId& session_id, const CdmKeySetId& key_set_id, const InitializationData& init_data, const CdmLicenseType license_type, CdmAppParameterMap& app_parameters, CdmKeyRequest* key_request) { - LOGI("CdmEngine::GenerateKeyRequest: %s", session_id.c_str()); + LOGI("Generating key request: session_id = %s", session_id.c_str()); CdmSessionId id = session_id; CdmResponseType sts; @@ -249,22 +248,20 @@ CdmResponseType CdmEngine::GenerateKeyRequest( if (license_type == kLicenseTypeRelease && !Properties::AlwaysUseKeySetIds()) { if (key_set_id.empty()) { - LOGE("CdmEngine::GenerateKeyRequest: invalid key set ID"); + LOGE("Invalid key set ID"); return EMPTY_KEYSET_ID_ENG_2; } - LOGI("CdmEngine::GenerateKeyRequest: key set ID: %s", key_set_id.c_str()); + LOGI("Key set ID: %s", key_set_id.c_str()); if (!session_id.empty()) { - LOGE("CdmEngine::GenerateKeyRequest: invalid session ID = %s", - session_id.c_str()); + LOGE("Invalid session ID: %s", session_id.c_str()); return INVALID_SESSION_ID; } std::unique_lock lock(release_key_sets_lock_); CdmReleaseKeySetMap::iterator iter = release_key_sets_.find(key_set_id); if (iter == release_key_sets_.end()) { - LOGE("CdmEngine::GenerateKeyRequest: key set ID not found = %s", - key_set_id.c_str()); + LOGE("Key set ID not found: %s", key_set_id.c_str()); return KEYSET_ID_NOT_FOUND_2; } @@ -273,13 +270,12 @@ CdmResponseType CdmEngine::GenerateKeyRequest( std::shared_ptr session; if (!session_map_.FindSession(id, &session)) { - LOGE("CdmEngine::GenerateKeyRequest: session_id not found = %s", - id.c_str()); + LOGE("Session ID not found: %s", id.c_str()); return SESSION_NOT_FOUND_2; } if (!key_request) { - LOGE("CdmEngine::GenerateKeyRequest: output destination provided"); + LOGE("Output destination provided"); return PARAMETER_NULL; } @@ -293,8 +289,7 @@ CdmResponseType CdmEngine::GenerateKeyRequest( sts, error_detail); if (sts != KEY_ADDED) { LOGE( - "CdmEngine::GenerateKeyRequest: key release restoration failed," - "sts = %d", + "Key release restoration failed, status = %d", static_cast(sts)); return sts; } @@ -310,10 +305,7 @@ CdmResponseType CdmEngine::GenerateKeyRequest( cert_provisioning_requested_security_level_ = session->GetRequestedSecurityLevel(); } - LOGE( - "CdmEngine::GenerateKeyRequest: key request generation failed, " - "sts = %d", - static_cast(sts)); + LOGE("Key request generation failed, status = %d", static_cast(sts)); return sts; } @@ -328,9 +320,9 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id, const CdmKeyResponse& key_data, CdmLicenseType* license_type, CdmKeySetId* key_set_id) { - LOGI("CdmEngine::AddKey: %s", session_id.c_str()); + LOGI("Adding key: session_id = %s", session_id.c_str()); if (license_type == nullptr) { - LOGE("CdmEngine::AddKey: license_type cannot be null."); + LOGE("No license type provided"); return PARAMETER_NULL; } @@ -339,19 +331,19 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id, if (license_type_release) { if (!key_set_id) { - LOGE("CdmEngine::AddKey: no key set id provided"); + LOGE("No key set ID provided"); return PARAMETER_NULL; } if (key_set_id->empty()) { - LOGE("CdmEngine::AddKey: invalid key set id"); + LOGE("Invalid key set ID"); return EMPTY_KEYSET_ID_ENG_3; } std::unique_lock lock(release_key_sets_lock_); CdmReleaseKeySetMap::iterator iter = release_key_sets_.find(*key_set_id); if (iter == release_key_sets_.end()) { - LOGE("CdmEngine::AddKey: key set id not found = %s", key_set_id->c_str()); + LOGE("Key set ID not found: %s", key_set_id->c_str()); return KEYSET_ID_NOT_FOUND_3; } @@ -360,12 +352,12 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id, std::shared_ptr session; if (!session_map_.FindSession(id, &session)) { - LOGE("CdmEngine::AddKey: session id not found = %s", id.c_str()); + LOGE("Session ID not found: %s", id.c_str()); return SESSION_NOT_FOUND_3; } if (key_data.empty()) { - LOGE("CdmEngine::AddKey: no key_data"); + LOGE("No key data"); return EMPTY_KEY_DATA_1; } @@ -387,7 +379,7 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id, if ((session->is_offline() || session->has_provider_session_token()) && !license_type_release) { *key_set_id = session->key_set_id(); - LOGI("CdmEngine::AddKey: key set ID: %s", key_set_id->c_str()); + LOGI("Key set ID: %s", key_set_id->c_str()); } else { key_set_id->clear(); } @@ -397,10 +389,10 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id, case KEY_ADDED: break; case NEED_KEY: - LOGI("CdmEngine::AddKey: service certificate loaded, no key added"); + LOGI("Service certificate loaded: No key added"); break; default: - LOGE("CdmEngine::AddKey: keys not added, result = %d", sts); + LOGE("Keys not added: status = %d", static_cast(sts)); break; } @@ -409,18 +401,17 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id, CdmResponseType CdmEngine::RestoreKey(const CdmSessionId& session_id, const CdmKeySetId& key_set_id) { - LOGI("CdmEngine::RestoreKey: session ID: %s, key set ID: %s", - session_id.c_str(), key_set_id.c_str()); + LOGI("Restoring key: session_id = %s, key_set_id = %s", session_id.c_str(), + key_set_id.c_str()); if (key_set_id.empty()) { - LOGI("CdmEngine::RestoreKey: invalid key set id"); + LOGI("Invalid key set ID"); return EMPTY_KEYSET_ID_ENG_4; } std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::RestoreKey: session_id not found = %s ", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_4; } @@ -435,18 +426,17 @@ CdmResponseType CdmEngine::RestoreKey(const CdmSessionId& session_id, session->GetRequestedSecurityLevel(); } if (sts != KEY_ADDED && sts != GET_RELEASED_LICENSE_ERROR) { - LOGE("CdmEngine::RestoreKey: restore offline session failed = %d", sts); + LOGE("Restore offline session failed: status = %d", static_cast(sts)); } return sts; } CdmResponseType CdmEngine::RemoveKeys(const CdmSessionId& session_id) { - LOGI("CdmEngine::RemoveKeys: %s", session_id.c_str()); + LOGI("Removing keys: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::RemoveKeys: session_id not found = %s", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_5; } @@ -456,11 +446,11 @@ CdmResponseType CdmEngine::RemoveKeys(const CdmSessionId& session_id) { } CdmResponseType CdmEngine::RemoveLicense(const CdmSessionId& session_id) { - LOGI("CdmEngine::RemoveLicense: %s", session_id.c_str()); + LOGI("Removing license: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("session_id not found = %s", session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_19; } @@ -469,17 +459,16 @@ CdmResponseType CdmEngine::RemoveLicense(const CdmSessionId& session_id) { CdmResponseType CdmEngine::GenerateRenewalRequest( const CdmSessionId& session_id, CdmKeyRequest* key_request) { - LOGI("CdmEngine::GenerateRenewalRequest: %s", session_id.c_str()); + LOGI("Generating renewal request: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::GenerateRenewalRequest: session_id not found = %s", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_6; } if (!key_request) { - LOGE("CdmEngine::GenerateRenewalRequest: no request destination"); + LOGE("No request destination"); return PARAMETER_NULL; } @@ -488,8 +477,7 @@ CdmResponseType CdmEngine::GenerateRenewalRequest( CdmResponseType sts = session->GenerateRenewalRequest(key_request); if (KEY_MESSAGE != sts) { - LOGE("CdmEngine::GenerateRenewalRequest: key request gen. failed, sts=%d", - sts); + LOGE("Key request gen. failed: status = %d", static_cast(sts)); return sts; } @@ -498,16 +486,16 @@ CdmResponseType CdmEngine::GenerateRenewalRequest( CdmResponseType CdmEngine::RenewKey(const CdmSessionId& session_id, const CdmKeyResponse& key_data) { - LOGI("CdmEngine::RenewKey: %s", session_id.c_str()); + LOGI("Renewing key: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::RenewKey: session_id not found = %s", session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_7; } if (key_data.empty()) { - LOGE("CdmEngine::RenewKey: no key_data"); + LOGE("No key data"); return EMPTY_KEY_DATA_2; } @@ -516,7 +504,7 @@ CdmResponseType CdmEngine::RenewKey(const CdmSessionId& session_id, cdm_session_renew_key_, sts); if (KEY_ADDED != sts) { - LOGE("CdmEngine::RenewKey: keys not added, sts=%d", static_cast(sts)); + LOGE("Keys not added: status = %d", static_cast(sts)); return sts; } @@ -526,13 +514,13 @@ CdmResponseType CdmEngine::RenewKey(const CdmSessionId& session_id, CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, const std::string& query_token, std::string* query_response) { - LOGI("CdmEngine::QueryStatus"); + LOGI("Querying status"); std::unique_ptr crypto_session( CryptoSession::MakeCryptoSession(metrics_->GetCryptoMetrics())); CdmResponseType status; if (!query_response) { - LOGE("CdmEngine::QueryStatus: no query response destination"); + LOGE("No query response destination"); return PARAMETER_NULL; } @@ -555,8 +543,8 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, *query_response = QUERY_VALUE_SECURITY_LEVEL_UNKNOWN; break; default: - LOGW("CdmEngine::QueryStatus: Unknown security level: %d", - found_security_level); + LOGW("Unknown security level: %d", + static_cast(found_security_level)); return UNKNOWN_ERROR; } return NO_ERROR; @@ -568,7 +556,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, &max_hdcp); if (status != NO_ERROR) { - LOGW("CdmEngine::QueryStatus: GetHdcpCapabilities failed: %d", status); + LOGW("GetHdcpCapabilities failed: status = %d", static_cast(status)); return status; } *query_response = MapHdcpVersion( @@ -580,7 +568,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, security_level, &supports_usage_reporting); if (!got_info) { - LOGW("CdmEngine::QueryStatus: UsageInformationSupport failed"); + LOGW("UsageInformationSupport failed"); metrics_->GetCryptoMetrics() ->crypto_session_usage_information_support_.SetError(got_info); return UNKNOWN_ERROR; @@ -597,8 +585,8 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, status = crypto_session->GetNumberOfOpenSessions(security_level, &number_of_open_sessions); if (status != NO_ERROR) { - LOGW("CdmEngine::QueryStatus: GetNumberOfOpenSessions failed: %d", - status); + LOGW("GetNumberOfOpenSessions failed: status = %d", + static_cast(status)); return status; } @@ -610,8 +598,8 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, security_level, &maximum_number_of_sessions); if (status != NO_ERROR) { - LOGW("CdmEngine::QueryStatus: GetMaxNumberOfOpenSessions failed: %d", - status); + LOGW("GetMaxNumberOfOpenSessions failed: status = %d", + static_cast(status)); return status; } @@ -620,7 +608,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, } else if (query_token == QUERY_KEY_OEMCRYPTO_API_VERSION) { uint32_t api_version; if (!crypto_session->GetApiVersion(security_level, &api_version)) { - LOGW("CdmEngine::QueryStatus: GetApiVersion failed"); + LOGW("GetApiVersion failed"); return UNKNOWN_ERROR; } @@ -633,7 +621,8 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, *query_response = QUERY_VALUE_NONE; return NO_ERROR; } else if (status != NO_ERROR) { - LOGW("CdmEngine::QueryStatus: GetCurrentSRMVersion failed: %d", status); + LOGW("GetCurrentSRMVersion failed: status = %d", + static_cast(status)); return status; } @@ -647,7 +636,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, } else if (query_token == QUERY_KEY_WVCDM_VERSION) { std::string cdm_version; if (!Properties::GetWVCdmVersion(&cdm_version)) { - LOGW("CdmEngine::QueryStatus: GetWVCdmVersion failed"); + LOGW("GetWVCdmVersion failed"); return UNKNOWN_ERROR; } @@ -656,7 +645,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, } else if (query_token == QUERY_KEY_RESOURCE_RATING_TIER) { uint32_t tier; if (!crypto_session->GetResourceRatingTier(security_level, &tier)) { - LOGW("CdmEngine::QueryStatus: GetResourceRatingTier failed"); + LOGW("GetResourceRatingTier failed"); return UNKNOWN_ERROR; } @@ -664,7 +653,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, return NO_ERROR; } else if (query_token == QUERY_KEY_OEMCRYPTO_BUILD_INFORMATION) { if (!crypto_session->GetBuildInformation(security_level, query_response)) { - LOGW("CdmEngine::QueryStatus: GetBuildInformation failed"); + LOGW("GetBuildInformation failed"); return UNKNOWN_ERROR; } return NO_ERROR; @@ -676,7 +665,9 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, CdmClientTokenType token_type = kClientTokenUninitialized; status = crypto_session->GetProvisioningMethod(security_level, &token_type); if (status != NO_ERROR) { - LOGW("CdmEngine::QueryStatus: GetProvisioningMethod failed: %d", status); + LOGW( + "GetProvisioningMethod failed: status = %d", + static_cast(status)); return status; } switch (token_type) { @@ -691,10 +682,8 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, break; case kClientTokenUninitialized: default: - LOGW( - "CdmEngine::QueryStatus: GetProvisioningMethod returns invalid " - "token type: %d", - token_type); + LOGW("GetProvisioningMethod returns invalid token type: %d", + static_cast(token_type)); return GET_PROVISIONING_METHOD_ERROR; break; } @@ -720,7 +709,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, uint32_t system_id; bool got_id = crypto_session->GetSystemId(&system_id); if (!got_id) { - LOGW("CdmEngine::QueryStatus: QUERY_KEY_SYSTEM_ID unknown failure"); + LOGW("QUERY_KEY_SYSTEM_ID unknown failure"); return UNKNOWN_ERROR; } @@ -729,14 +718,13 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, std::string provisioning_id; status = crypto_session->GetProvisioningId(&provisioning_id); if (status != NO_ERROR) { - LOGW("CdmEngine::QueryStatus: GetProvisioningId failed: %d", status); + LOGW("GetProvisioningId failed: status = %d", static_cast(status)); return status; } *query_response = provisioning_id; } else { - LOGW("CdmEngine::QueryStatus: Unknown status requested, token = %s", - query_token.c_str()); + LOGW("Unknown status requested: query_token = %s", query_token.c_str()); return INVALID_QUERY_KEY; } @@ -745,33 +733,30 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, CdmResponseType CdmEngine::QuerySessionStatus(const CdmSessionId& session_id, CdmQueryMap* query_response) { - LOGI("CdmEngine::QuerySessionStatus: %s", session_id.c_str()); + LOGI("Querying session status: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::QuerySessionStatus: session_id not found = %s", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_8; } return session->QueryStatus(query_response); } bool CdmEngine::IsReleaseSession(const CdmSessionId& session_id) { - LOGI("CdmEngine::IsReleaseSession: %s", session_id.c_str()); + LOGI("Check if release session: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::IsReleaseSession: session_id not found = %s", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return false; } return session->is_release(); } bool CdmEngine::IsOfflineSession(const CdmSessionId& session_id) { - LOGI("CdmEngine::IsOfflineSession: %s", session_id.c_str()); + LOGI("Check if offline session: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::IsOfflineSession: session_id not found = %s", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return false; } return session->is_offline(); @@ -779,11 +764,10 @@ bool CdmEngine::IsOfflineSession(const CdmSessionId& session_id) { CdmResponseType CdmEngine::QueryKeyStatus(const CdmSessionId& session_id, CdmQueryMap* query_response) { - LOGI("CdmEngine::QueryKeyStatus: %s", session_id.c_str()); + LOGI("Querying key status: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::QueryKeyStatus: session_id not found = %s", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_9; } return session->QueryKeyStatus(query_response); @@ -792,15 +776,15 @@ CdmResponseType CdmEngine::QueryKeyStatus(const CdmSessionId& session_id, CdmResponseType CdmEngine::QueryKeyAllowedUsage(const CdmSessionId& session_id, const std::string& key_id, CdmKeyAllowedUsage* key_usage) { - LOGI("CdmEngine::QueryKeyAllowedUsage: %s", session_id.c_str()); + LOGI("Querying allowed key usage: session_id = %s, key_id = %s", + session_id.c_str(), key_id.c_str()); if (!key_usage) { - LOGE("CdmEngine::QueryKeyAllowedUsage: no response destination"); + LOGE("No response destination"); return PARAMETER_NULL; } std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::QueryKeyAllowedUsage: session_id not found = %s", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_12; } return session->QueryKeyAllowedUsage(key_id, key_usage); @@ -808,12 +792,13 @@ CdmResponseType CdmEngine::QueryKeyAllowedUsage(const CdmSessionId& session_id, CdmResponseType CdmEngine::QueryKeyAllowedUsage(const std::string& key_id, CdmKeyAllowedUsage* key_usage) { - LOGI("CdmEngine::QueryKeyAllowedUsage (all sessions)"); - CdmResponseType session_sts; + LOGI("Querying allowed key useage (all sessions): key_id = %s", + key_id.c_str()); + CdmResponseType sts; CdmKeyAllowedUsage found_in_this_session; bool found = false; if (!key_usage) { - LOGE("CdmEngine::QueryKeyAllowedUsage: no response destination"); + LOGE("No response destination"); return PARAMETER_NULL; } key_usage->Clear(); @@ -823,8 +808,8 @@ CdmResponseType CdmEngine::QueryKeyAllowedUsage(const std::string& key_id, for (CdmSessionList::iterator iter = sessions.begin(); iter != sessions.end(); ++iter) { - session_sts = (*iter)->QueryKeyAllowedUsage(key_id, &found_in_this_session); - if (session_sts == NO_ERROR) { + sts = (*iter)->QueryKeyAllowedUsage(key_id, &found_in_this_session); + if (sts == NO_ERROR) { if (found) { // Found another key. If usage settings do not match, fail. if (!key_usage->Equals(found_in_this_session)) { @@ -835,11 +820,10 @@ CdmResponseType CdmEngine::QueryKeyAllowedUsage(const std::string& key_id, *key_usage = found_in_this_session; found = true; } - } else if (session_sts != KEY_NOT_FOUND_1) { - LOGE("CdmEngine::QueryKeyAllowedUsage (all sessions) FAILED = %d", - session_sts); + } else if (sts != KEY_NOT_FOUND_1) { + LOGE("QueryKeyAllowedUsage failed: status = %d", static_cast(sts)); key_usage->Clear(); - return session_sts; + return sts; } } return (found) ? NO_ERROR : KEY_NOT_FOUND_2; @@ -847,18 +831,18 @@ CdmResponseType CdmEngine::QueryKeyAllowedUsage(const std::string& key_id, CdmResponseType CdmEngine::QueryOemCryptoSessionId( const CdmSessionId& session_id, CdmQueryMap* query_response) { - LOGI("CdmEngine::QueryOemCryptoSessionId: %s", session_id.c_str()); + LOGI("Querying OEMCrypto Session ID: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::QueryOemCryptoSessionId: session_id not found = %s", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_10; } return session->QueryOemCryptoSessionId(query_response); } bool CdmEngine::IsSecurityLevelSupported(CdmSecurityLevel level) { - LOGI("CdmEngine::IsSecurityLevelSupported"); + LOGI("Checking if security level is supported: level = %d", + static_cast(level)); metrics::CryptoMetrics alternate_crypto_metrics; std::unique_ptr crypto_session( CryptoSession::MakeCryptoSession(&alternate_crypto_metrics)); @@ -870,8 +854,7 @@ bool CdmEngine::IsSecurityLevelSupported(CdmSecurityLevel level) { case kSecurityLevelL3: return crypto_session->GetSecurityLevel(kLevel3) == kSecurityLevelL3; default: - LOGE("CdmEngine::IsSecurityLevelSupported: Invalid security level: %d", - level); + LOGE("Invalid security level: %d", static_cast(level)); return false; } } @@ -887,13 +870,13 @@ CdmResponseType CdmEngine::GetProvisioningRequest( CdmCertificateType cert_type, const std::string& cert_authority, const std::string& service_certificate, CdmProvisioningRequest* request, std::string* default_url) { - LOGI("CdmEngine::GetProvisioningRequest"); + LOGI("Getting provisioning request"); if (!request) { - LOGE("CdmEngine::GetProvisioningRequest: invalid output parameters"); + LOGE("Invalid output parameters: request is null"); return INVALID_PROVISIONING_REQUEST_PARAM_1; } if (!default_url) { - LOGE("CdmEngine::GetProvisioningRequest: invalid output parameters"); + LOGE("Invalid output parameters: default_url is null"); return INVALID_PROVISIONING_REQUEST_PARAM_2; } @@ -924,23 +907,19 @@ CdmResponseType CdmEngine::GetProvisioningRequest( CdmResponseType CdmEngine::HandleProvisioningResponse( const CdmProvisioningResponse& response, std::string* cert, std::string* wrapped_key) { - LOGI("CdmEngine::HandleProvisioningResponse"); + LOGI("Handling provision request"); if (response.empty()) { - LOGE("CdmEngine::HandleProvisioningResponse: Empty provisioning response."); + LOGE("Empty provisioning response"); cert_provisioning_.reset(NULL); return EMPTY_PROVISIONING_RESPONSE; } if (cert == NULL) { - LOGE( - "CdmEngine::HandleProvisioningResponse: invalid certificate " - "destination"); + LOGE("Invalid certificate destination"); cert_provisioning_.reset(NULL); return INVALID_PROVISIONING_PARAMETERS_1; } if (wrapped_key == NULL) { - LOGE( - "CdmEngine::HandleProvisioningResponse: invalid wrapped key " - "destination"); + LOGE("Invalid wrapped key destination"); cert_provisioning_.reset(NULL); return INVALID_PROVISIONING_PARAMETERS_2; } @@ -955,16 +934,12 @@ CdmResponseType CdmEngine::HandleProvisioningResponse( metrics_->GetCryptoMetrics(), crypto_session_open_, status, cert_provisioning_requested_security_level_); if (NO_ERROR != status) { - LOGE( - "CdmEngine::HandleProvisioningResponse: provisioning object " - "missing and crypto session open failed."); + LOGE("Provisioning object missing and crypto session open failed"); return EMPTY_PROVISIONING_CERTIFICATE_2; } CdmSecurityLevel security_level = crypto_session->GetSecurityLevel(); if (!IsProvisioned(security_level)) { - LOGE( - "CdmEngine::HandleProvisioningResponse: provisioning object " - "missing."); + LOGE("Provisioning object missing"); return EMPTY_PROVISIONING_CERTIFICATE_1; } return NO_ERROR; @@ -992,13 +967,13 @@ bool CdmEngine::IsProvisioned(CdmSecurityLevel security_level) { CdmResponseType status = session.Init(&property_set); if (NO_ERROR != status) { - LOGE("CdmEngine::IsProvisioned: CdmSession::Init returned %lu", status); + LOGE("Init failed: status = %d", static_cast(status)); } return status == NO_ERROR; } CdmResponseType CdmEngine::Unprovision(CdmSecurityLevel security_level) { - LOGI("CdmEngine::Unprovision: security level: %d", security_level); + LOGI("Unprovisioning: security_level = %d", static_cast(security_level)); // Devices with baked-in DRM certs cannot be reprovisioned and therefore must // not be unprovisioned. std::unique_ptr crypto_session( @@ -1015,19 +990,19 @@ CdmResponseType CdmEngine::Unprovision(CdmSecurityLevel security_level) { DeviceFiles handle(file_system_); if (!handle.Init(security_level)) { - LOGE("CdmEngine::Unprovision: unable to initialize device files"); + LOGE("Unable to initialize device files"); return UNPROVISION_ERROR_1; } if (!file_system_->IsGlobal()) { if (!handle.RemoveCertificate()) { - LOGE("CdmEngine::Unprovision: unable to delete certificate"); + LOGE("Unable to delete certificate"); return UNPROVISION_ERROR_2; } return NO_ERROR; } else { if (!handle.DeleteAllFiles()) { - LOGE("CdmEngine::Unprovision: unable to delete files"); + LOGE("Unable to delete files"); return UNPROVISION_ERROR_3; } return DeleteUsageTable(security_level); @@ -1035,7 +1010,8 @@ CdmResponseType CdmEngine::Unprovision(CdmSecurityLevel security_level) { } CdmResponseType CdmEngine::DeleteUsageTable(CdmSecurityLevel security_level) { - LOGI("CdmEngine::DeleteUsageTable: security level: %d", security_level); + LOGI("Deleting usage table: security_level = %d", + static_cast(security_level)); std::unique_ptr crypto_session( CryptoSession::MakeCryptoSession(metrics_->GetCryptoMetrics())); CdmResponseType status; @@ -1044,16 +1020,15 @@ CdmResponseType CdmEngine::DeleteUsageTable(CdmSecurityLevel security_level) { metrics_->GetCryptoMetrics(), crypto_session_open_, status, security_level == kSecurityLevelL3 ? kLevel3 : kLevelDefault); if (NO_ERROR != status) { - LOGE("CdmEngine::DeleteUsageTable: error opening crypto session: %d", - status); + LOGE("Error opening crypto session: status = %d", static_cast(status)); return UNPROVISION_ERROR_4; } status = crypto_session->DeleteAllUsageReports(); metrics_->GetCryptoMetrics() ->crypto_session_delete_all_usage_reports_.Increment(status); if (status != NO_ERROR) { - LOGE("CdmEngine::DeleteUsageTable: error deleteing usage reports: %d", - status); + LOGE("Error deleteing usage reports: status = %d", + static_cast(status)); } return status; } @@ -1062,15 +1037,15 @@ CdmResponseType CdmEngine::ListStoredLicenses( CdmSecurityLevel security_level, std::vector* key_set_ids) { DeviceFiles handle(file_system_); if (!key_set_ids) { - LOGE("CdmEngine::ListStoredLicenses: no response destination"); + LOGE("No response destination"); return INVALID_PARAMETERS_ENG_22; } if (!handle.Init(security_level)) { - LOGE("CdmEngine::ListStoredLicenses: unable to initialize device files"); + LOGE("Unable to initialize device files"); return LIST_LICENSE_ERROR_1; } if (!handle.ListLicenses(key_set_ids)) { - LOGE("CdmEngine::ListStoredLicenses: ListLicenses call failed"); + LOGE("ListLicenses call failed"); return LIST_LICENSE_ERROR_2; } return NO_ERROR; @@ -1082,15 +1057,15 @@ CdmResponseType CdmEngine::ListUsageIds( std::vector* provider_session_tokens) { DeviceFiles handle(file_system_); if (!ksids && !provider_session_tokens) { - LOGE("CdmEngine::ListUsageIds: no response destination"); + LOGE("No response destination"); return INVALID_PARAMETERS_ENG_23; } if (!handle.Init(security_level)) { - LOGE("CdmEngine::ListUsageIds: unable to initialize device files"); + LOGE("Unable to initialize device files"); return LIST_USAGE_ERROR_1; } if (!handle.ListUsageIds(app_id, ksids, provider_session_tokens)) { - LOGE("CdmEngine::ListUsageIds: ListUsageIds call failed"); + LOGE("ListUsageIds call failed"); return LIST_USAGE_ERROR_2; } return NO_ERROR; @@ -1099,18 +1074,18 @@ CdmResponseType CdmEngine::ListUsageIds( CdmResponseType CdmEngine::DeleteUsageRecord(const std::string& app_id, CdmSecurityLevel security_level, const std::string& key_set_id) { - LOGI("CdmEngine::DeleteUsageRecord: %s, app ID: %s", key_set_id.c_str(), - app_id.c_str()); + LOGI("Deleting usage record: key_set_id = %s, app_id = %s", + key_set_id.c_str(), app_id.c_str()); std::string provider_session_token; DeviceFiles handle(file_system_); if (!handle.Init(security_level)) { - LOGE("CdmEngine::DeleteUsageRecord: unable to initialize device files"); + LOGE("Unable to initialize device files"); return DELETE_USAGE_ERROR_1; } if (!handle.GetProviderSessionToken(app_id, key_set_id, &provider_session_token)) { - LOGE("CdmEngine::DeleteUsageRecord: GetProviderSessionToken failed"); + LOGE("GetProviderSessionToken failed"); return DELETE_USAGE_ERROR_2; } @@ -1122,7 +1097,7 @@ CdmResponseType CdmEngine::GetOfflineLicenseState( CdmOfflineLicenseState* license_state) { DeviceFiles handle(file_system_); if (!handle.Init(security_level)) { - LOGE("CdmEngine::GetOfflineLicenseState: cannot initialize device files"); + LOGE("Cannot initialize device files"); return GET_OFFLINE_LICENSE_STATE_ERROR_1; } @@ -1152,10 +1127,8 @@ CdmResponseType CdmEngine::GetOfflineLicenseState( &usage_entry, &usage_entry_number, &sub_error_code)) { *license_state = MapDeviceFilesLicenseState(state); } else { - LOGE( - "CdmEngine::GetOfflineLicenseState:: failed to retrieve license state " - "key set id = %s", - key_set_id.c_str()); + LOGE("Failed to retrieve license state: key_set_id = %s", + key_set_id.c_str()); return GET_OFFLINE_LICENSE_STATE_ERROR_2; } return NO_ERROR; @@ -1171,7 +1144,7 @@ CdmResponseType CdmEngine::RemoveOfflineLicense( nullptr /* event listener */); if (sts != NO_ERROR) { if (!handle.Init(security_level)) { - LOGE("CdmEngine::RemoveOfflineLicense: cannot initialize device files"); + LOGE("Cannot initialize device files"); } handle.DeleteLicense(key_set_id); return REMOVE_OFFLINE_LICENSE_ERROR_1; @@ -1188,8 +1161,7 @@ CdmResponseType CdmEngine::RemoveOfflineLicense( std::unique_lock lock(release_key_sets_lock_); CdmReleaseKeySetMap::iterator iter = release_key_sets_.find(key_set_id); if (iter == release_key_sets_.end()) { - LOGE("CdmEngine::RemoveOfflineLicense: key set id not found = %s", - key_set_id.c_str()); + LOGE("Key set ID not found: %s", key_set_id.c_str()); sts = REMOVE_OFFLINE_LICENSE_ERROR_2; } else { session_id = iter->second.first; @@ -1198,7 +1170,7 @@ CdmResponseType CdmEngine::RemoveOfflineLicense( } if (sts != NO_ERROR) { - LOGE("CdmEngine: GenerateKeyRequest error=%d", sts); + LOGE("GenerateKeyRequest failed: status = %d", static_cast(sts)); handle.DeleteLicense(key_set_id); } CloseKeySetSession(key_set_id); @@ -1210,12 +1182,13 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, const CdmSecureStopId& ssid, int* error_detail, CdmUsageInfo* usage_info) { - LOGI("CdmEngine::GetUsageInfo: %s", ssid.c_str()); + LOGI("Getting usage info: app_id = %s, ssid = %s", app_id.c_str(), + ssid.c_str()); if (NULL == usage_property_set_.get()) { usage_property_set_.reset(new UsagePropertySet()); } if (!usage_info) { - LOGE("CdmEngine::GetUsageInfo: no usage info destination"); + LOGE("No usage info destination"); return PARAMETER_NULL; } usage_property_set_->set_security_level(kLevelDefault); @@ -1223,12 +1196,12 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, usage_session_.reset(new CdmSession(file_system_, metrics_->AddSession())); CdmResponseType status = usage_session_->Init(usage_property_set_.get()); if (NO_ERROR != status) { - LOGE("CdmEngine::GetUsageInfo: session init error: %d", status); + LOGE("Session init error: status = %d", static_cast(status)); return status; } DeviceFiles handle(file_system_); if (!handle.Init(usage_session_->GetSecurityLevel())) { - LOGE("CdmEngine::GetUsageInfo: device file init error"); + LOGE("Device file init error"); return GET_USAGE_INFO_ERROR_1; } @@ -1243,11 +1216,11 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, usage_session_.reset(new CdmSession(file_system_, metrics_->AddSession())); status = usage_session_->Init(usage_property_set_.get()); if (NO_ERROR != status) { - LOGE("CdmEngine::GetUsageInfo: session init error"); + LOGE("Session init error"); return status; } if (!handle.Reset(usage_session_->GetSecurityLevel())) { - LOGE("CdmEngine::GetUsageInfo: device file init error"); + LOGE("Device file init error"); return GET_USAGE_INFO_ERROR_2; } if (!handle.RetrieveUsageInfo(DeviceFiles::GetUsageInfoFileName(app_id), @@ -1260,7 +1233,7 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, status = usage_session_->RestoreUsageSession(usage_data, error_detail); if (KEY_ADDED != status) { - LOGE("CdmEngine::GetUsageInfo: restore usage session error %d", status); + LOGE("RestoreUsageSession failed: status = %d", static_cast(status)); usage_info->clear(); return status; } @@ -1272,7 +1245,8 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, usage_info->push_back(request.message); if (KEY_MESSAGE != status) { - LOGE("CdmEngine::GetUsageInfo: generate release request error: %d", status); + LOGE("GenerateReleaseRequest failed: status = %d", + static_cast(status)); usage_info->clear(); return status; } @@ -1283,12 +1257,12 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, int* error_detail, CdmUsageInfo* usage_info) { - LOGI("CdmEngine::GetUsageInfo: %s", app_id.c_str()); + LOGI("Getting usage info: app_id = %s", app_id.c_str()); // Return a random usage report from a random security level SecurityLevel security_level = ((rand() % 2) == 0) ? kLevelDefault : kLevel3; CdmResponseType status = UNKNOWN_ERROR; if (!usage_info) { - LOGE("CdmEngine::GetUsageInfo: no usage info destination"); + LOGE("No usage info destination"); return PARAMETER_NULL; } do { @@ -1313,8 +1287,8 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, SecurityLevel requested_security_level, int* error_detail, CdmUsageInfo* usage_info) { - LOGI("CdmEngine::GetUsageInfo: %s, security level: %d", app_id.c_str(), - requested_security_level); + LOGI("Getting usage info: app_id = %s, security_level = %d", app_id.c_str(), + static_cast(requested_security_level)); if (NULL == usage_property_set_.get()) { usage_property_set_.reset(new UsagePropertySet()); } @@ -1325,25 +1299,25 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, CdmResponseType status = usage_session_->Init(usage_property_set_.get()); if (NO_ERROR != status) { - LOGE("CdmEngine::GetUsageInfo: session init error"); + LOGE("Session init error"); return status; } DeviceFiles handle(file_system_); if (!handle.Init(usage_session_->GetSecurityLevel())) { - LOGE("CdmEngine::GetUsageInfo: unable to initialize device files"); + LOGE("Unable to initialize device files"); return GET_USAGE_INFO_ERROR_3; } std::vector usage_data; if (!handle.RetrieveUsageInfo(DeviceFiles::GetUsageInfoFileName(app_id), &usage_data)) { - LOGE("CdmEngine::GetUsageInfo: unable to read usage information"); + LOGE("Unable to read usage information"); return GET_USAGE_INFO_ERROR_4; } if (!usage_info) { - LOGE("CdmEngine::GetUsageInfo: no usage info destination"); + LOGE("No usage info destination"); return PARAMETER_NULL; } if (0 == usage_data.size()) { @@ -1353,11 +1327,11 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, usage_info->resize(kUsageReportsPerRequest); - uint32_t index = rand() % usage_data.size(); + size_t index = rand() % usage_data.size(); status = usage_session_->RestoreUsageSession(usage_data[index], error_detail); if (KEY_ADDED != status) { - LOGE("CdmEngine::GetUsageInfo: restore usage session (%d) error %ld", index, - status); + LOGE("RestoreUsageSession failed: index = %zu, status = %d", index, + static_cast(status)); usage_info->clear(); return status; } @@ -1376,8 +1350,8 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, usage_info->clear(); break; default: - LOGE("CdmEngine::GetUsageInfo: generate release request error: %d", - status); + LOGE("GenerateReleaseRequest failed: status = %d", + static_cast(status)); usage_info->clear(); break; } @@ -1386,8 +1360,8 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id, CdmResponseType CdmEngine::RemoveAllUsageInfo( const std::string& app_id, CdmSecurityLevel cdm_security_level) { - LOGI("CdmEngine::RemoveAllUsageInfo: %s, security level: %d", app_id.c_str(), - cdm_security_level); + LOGI("Removing all usage info: app_id = %s, security_level = %d", + app_id.c_str(), static_cast(cdm_security_level)); if (usage_property_set_.get() == nullptr) { usage_property_set_.reset(new UsagePropertySet()); } @@ -1411,8 +1385,7 @@ CdmResponseType CdmEngine::RemoveAllUsageInfo( do { if (!handle.RetrieveUsageInfo( DeviceFiles::GetUsageInfoFileName(app_id), &usage_data)) { - LOGW( - "CdmEngine::RemoveAllUsageInfo: failed to retrieve usage info"); + LOGW("Failed to retrieve usage info"); break; } @@ -1422,18 +1395,14 @@ CdmResponseType CdmEngine::RemoveAllUsageInfo( usage_data[0].usage_entry_number); if (res != NO_ERROR) { - LOGW( - "CdmEngine::RemoveAllUsageInfo: failed to delete usage " - "entry: error: %d", - res); + LOGW("Failed to delete usage entry: status = %d", + static_cast(res)); break; } if (!handle.DeleteUsageInfo(DeviceFiles::GetUsageInfoFileName(app_id), usage_data[0].provider_session_token)) { - LOGW( - "CdmEngine::RemoveAllUsageInfo: failed to delete usage " - "info"); + LOGW("Failed to delete usage info"); break; } } while (!usage_data.empty()); @@ -1451,10 +1420,8 @@ CdmResponseType CdmEngine::RemoveAllUsageInfo( if (!handle.DeleteAllUsageInfoForApp( DeviceFiles::GetUsageInfoFileName(app_id), &provider_session_tokens)) { - LOGE( - "CdmEngine::RemoveAllUsageInfo: failed to delete %d secure" - "stops", - cdm_security_level); + LOGE("Failed to delete secure stops: cdm_security_level = %d", + static_cast(cdm_security_level)); status = REMOVE_ALL_USAGE_INFO_ERROR_1; } else { CdmResponseType status2 = @@ -1474,7 +1441,7 @@ CdmResponseType CdmEngine::RemoveAllUsageInfo( } CdmResponseType CdmEngine::RemoveAllUsageInfo(const std::string& app_id) { - LOGI("CdmEngine::RemoveAllUsageInfo: %s", app_id.c_str()); + LOGI("Removing all usage info: app_id = %s", app_id.c_str()); CdmResponseType status_l1, status_l3; status_l1 = status_l3 = NO_ERROR; status_l1 = RemoveAllUsageInfo(app_id, kSecurityLevelL1); @@ -1484,7 +1451,7 @@ CdmResponseType CdmEngine::RemoveAllUsageInfo(const std::string& app_id) { CdmResponseType CdmEngine::RemoveUsageInfo( const std::string& app_id, const CdmSecureStopId& provider_session_token) { - LOGI("CdmEngine::RemoveUsageInfo: %s, PST: %s", app_id.c_str(), + LOGI("Removing usage info: app_id = %s, pst = %s", app_id.c_str(), provider_session_token.c_str()); if (NULL == usage_property_set_.get()) { usage_property_set_.reset(new UsagePropertySet()); @@ -1551,8 +1518,7 @@ CdmResponseType CdmEngine::RemoveUsageInfo( break; } } else { - LOGE("CdmEngine::RemoveUsageInfo: failed to initialize L%d devicefiles", - j); + LOGE("Failed to initialize L%d device files", j); status = REMOVE_USAGE_INFO_ERROR_2; } } @@ -1562,47 +1528,46 @@ CdmResponseType CdmEngine::RemoveUsageInfo( CdmResponseType CdmEngine::ReleaseUsageInfo( const CdmUsageInfoReleaseMessage& message) { - LOGI("CdmEngine::ReleaseUsageInfo"); + LOGI("Releasing usage info"); if (NULL == usage_session_.get()) { - LOGE("CdmEngine::ReleaseUsageInfo: cdm session not initialized"); + LOGE("CDM session not initialized"); return RELEASE_USAGE_INFO_ERROR; } CdmResponseType status = usage_session_->ReleaseKey(message); usage_session_.reset(NULL); if (NO_ERROR != status) { - LOGE("CdmEngine::ReleaseUsageInfo: release key error: %d", status); + LOGE("ReleaseKey failed: status = %d", status); } return status; } CdmResponseType CdmEngine::LoadUsageSession(const CdmKeySetId& key_set_id, CdmKeyMessage* release_message) { - LOGI("CdmEngine::LoadUsageSession: %s", key_set_id.c_str()); + LOGI("Loading usage session: key_set_id = %s", key_set_id.c_str()); // This method is currently only used by the CE CDM, in which all session IDs // are key set IDs. assert(Properties::AlwaysUseKeySetIds()); if (key_set_id.empty()) { - LOGE("CdmEngine::LoadUsageSession: invalid key set id"); + LOGE("Invalid key set ID"); return EMPTY_KEYSET_ID_ENG_5; } std::shared_ptr session; if (!session_map_.FindSession(key_set_id, &session)) { - LOGE("CdmEngine::LoadUsageSession: session_id not found = %s ", - key_set_id.c_str()); + LOGE("Session ID not found: %s ", key_set_id.c_str()); return SESSION_NOT_FOUND_11; } if (!release_message) { - LOGE("CdmEngine::LoadUsageSession: no release message destination"); + LOGE("No release message destination"); return PARAMETER_NULL; } DeviceFiles handle(file_system_); if (!handle.Init(session->GetSecurityLevel())) { - LOGE("CdmEngine::LoadUsageSession: unable to initialize device files"); + LOGE("Unable to initialize device files"); return LOAD_USAGE_INFO_FILE_ERROR; } @@ -1615,7 +1580,7 @@ CdmResponseType CdmEngine::LoadUsageSession(const CdmKeySetId& key_set_id, &(usage_data.provider_session_token), &(usage_data.license_request), &(usage_data.license), &(usage_data.usage_entry), &(usage_data.usage_entry_number))) { - LOGE("CdmEngine::LoadUsageSession: unable to find usage information"); + LOGE("Unable to find usage information"); return LOAD_USAGE_INFO_MISSING; } @@ -1626,7 +1591,7 @@ CdmResponseType CdmEngine::LoadUsageSession(const CdmKeySetId& key_set_id, session->GetMetrics()->cdm_session_restore_usage_session_.Increment( status, error_detail); if (KEY_ADDED != status) { - LOGE("CdmEngine::LoadUsageSession: usage session error %ld", status); + LOGE("Usage session error: status = %d", static_cast(status)); return status; } @@ -1643,8 +1608,8 @@ CdmResponseType CdmEngine::LoadUsageSession(const CdmKeySetId& key_set_id, session->DeleteLicenseFile(); break; default: - LOGE("CdmEngine::LoadUsageSession: generate release request error: %d", - status); + LOGE("GenerateReleaseRequest failed: status = %d", + static_cast(status)); break; } return status; @@ -1653,24 +1618,24 @@ CdmResponseType CdmEngine::LoadUsageSession(const CdmKeySetId& key_set_id, CdmResponseType CdmEngine::Decrypt(const CdmSessionId& session_id, const CdmDecryptionParameters& parameters) { if (parameters.key_id == NULL) { - LOGE("CdmEngine::Decrypt: no key_id"); + LOGE("No key ID"); return INVALID_DECRYPT_PARAMETERS_ENG_1; } if (parameters.encrypt_buffer == NULL) { - LOGE("CdmEngine::Decrypt: no src encrypt buffer"); + LOGE("No src encrypt buffer"); return INVALID_DECRYPT_PARAMETERS_ENG_2; } if (parameters.iv == NULL) { - LOGE("CdmEngine::Decrypt: no iv"); + LOGE("No IV"); return INVALID_DECRYPT_PARAMETERS_ENG_3; } if (parameters.decrypt_buffer == NULL) { if (!parameters.is_secure && !Properties::Properties::oem_crypto_use_fifo()) { - LOGE("CdmEngine::Decrypt: no dest decrypt buffer"); + LOGE("No dest decrypt buffer"); return INVALID_DECRYPT_PARAMETERS_ENG_4; } // else we must be level 1 direct and we don't need to return a buffer. @@ -1696,13 +1661,12 @@ CdmResponseType CdmEngine::Decrypt(const CdmSessionId& session_id, } } if (session.get() == NULL) { - LOGE("CdmEngine::Decrypt: session not found: Empty session ID"); + LOGE("Session not found: Empty session ID"); return SESSION_NOT_FOUND_FOR_DECRYPT; } } else { if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::Decrypt: session not found: id=%s, id size=%d", - session_id.c_str(), session_id.size()); + LOGE("Session not found: session_id = %s", session_id.c_str()); return SESSION_NOT_FOUND_FOR_DECRYPT; } } @@ -1717,13 +1681,12 @@ CdmResponseType CdmEngine::GenericEncrypt(const std::string& session_id, CdmEncryptionAlgorithm algorithm, std::string* out_buffer) { if (out_buffer == NULL) { - LOGE("CdmEngine::GenericEncrypt: no out_buffer provided"); + LOGE("No out buffer provided"); return PARAMETER_NULL; } std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::GenericEncrypt: session_id not found = %s ", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_13; } return session->GenericEncrypt(in_buffer, key_id, iv, algorithm, out_buffer); @@ -1736,13 +1699,12 @@ CdmResponseType CdmEngine::GenericDecrypt(const std::string& session_id, CdmEncryptionAlgorithm algorithm, std::string* out_buffer) { if (out_buffer == NULL) { - LOGE("CdmEngine::GenericDecrypt: no out_buffer provided"); + LOGE("No out buffer provided"); return PARAMETER_NULL; } std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::GenericDecrypt: session_id not found = %s ", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_14; } return session->GenericDecrypt(in_buffer, key_id, iv, algorithm, out_buffer); @@ -1754,13 +1716,12 @@ CdmResponseType CdmEngine::GenericSign(const std::string& session_id, CdmSigningAlgorithm algorithm, std::string* signature) { if (signature == NULL) { - LOGE("CdmEngine::GenericSign: no signature buffer provided"); + LOGE("No signature buffer provided"); return PARAMETER_NULL; } std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::GenericSign: session_id not found = %s ", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_15; } return session->GenericSign(message, key_id, algorithm, signature); @@ -1773,8 +1734,7 @@ CdmResponseType CdmEngine::GenericVerify(const std::string& session_id, const std::string& signature) { std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { - LOGE("CdmEngine::GenericVerify: session_id not found = %s ", - session_id.c_str()); + LOGE("Session ID not found: %s", session_id.c_str()); return SESSION_NOT_FOUND_16; } return session->GenericVerify(message, key_id, algorithm, signature); @@ -1784,15 +1744,15 @@ CdmResponseType CdmEngine::ParseDecryptHashString( const std::string& hash_string, CdmSessionId* session_id, uint32_t* frame_number, std::string* hash) { if (session_id == nullptr) { - LOGE("CdmEngine::ParseDecryptHashString: |session_id| was not provided"); + LOGE("Session ID was not provided"); return PARAMETER_NULL; } if (frame_number == nullptr) { - LOGE("CdmEngine::ParseDecryptHashString: |frame_number| was not provided"); + LOGE("Frame number was not provided"); return PARAMETER_NULL; } if (hash == nullptr) { - LOGE("CdmEngine::ParseDecryptHashString: |hash| was not provided"); + LOGE("Hash was not provided"); return PARAMETER_NULL; } std::stringstream ss; @@ -1804,8 +1764,8 @@ CdmResponseType CdmEngine::ParseDecryptHashString( } if (tokens.size() != 3) { LOGE( - "CdmEngine::ParseDecryptHashString: |hash_string| has invalid format, " - "unexpected number of tokens: %d (%s)", + "Hash string has invalid format: " + "Unexpected number of tokens: %zu (hash_string = %s)", tokens.size(), hash_string.c_str()); return INVALID_DECRYPT_HASH_FORMAT; } @@ -1813,8 +1773,8 @@ CdmResponseType CdmEngine::ParseDecryptHashString( for (size_t i = 0; i < tokens.size(); ++i) { if (tokens[i].empty()) { LOGE( - "CdmEngine::ParseDecryptHashString: |hash_string| has invalid " - "format, token %d of length 0: %s", + "Hash string has invalid format: token %zu of length 0: " + "hash_string = %s", i, hash_string.c_str()); return INVALID_DECRYPT_HASH_FORMAT; } @@ -1823,17 +1783,14 @@ CdmResponseType CdmEngine::ParseDecryptHashString( *session_id = tokens[0]; std::istringstream iss(tokens[1]); if (!(iss >> *frame_number)) { - LOGE( - "CdmEngine::ParseDecryptHashString: error while trying to convert " - "frame number to a numeric format: %s", - hash_string.c_str()); + LOGE("Error while trying to convert frame number to a numeric format: %s", + hash_string.c_str()); return INVALID_DECRYPT_HASH_FORMAT; } std::vector hash_vec = wvcdm::a2b_hex(tokens[2]); if (hash_vec.empty()) { - LOGE("CdmEngine::ParseDecryptHashString: malformed hash: %s", - hash_string.c_str()); + LOGE("Malformed hash: %s", hash_string.c_str()); return INVALID_DECRYPT_HASH_FORMAT; } hash->assign(hash_vec.begin(), hash_vec.end()); @@ -1843,7 +1800,7 @@ CdmResponseType CdmEngine::ParseDecryptHashString( CdmResponseType CdmEngine::SetDecryptHash(const CdmSessionId& session_id, uint32_t frame_number, const std::string& hash) { - LOGI("CdmEngine::SetDecryptHash: %s", session_id.c_str()); + LOGI("Setting decrypt hash: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { return SESSION_NOT_FOUND_20; @@ -1853,7 +1810,7 @@ CdmResponseType CdmEngine::SetDecryptHash(const CdmSessionId& session_id, CdmResponseType CdmEngine::GetDecryptHashError(const CdmSessionId& session_id, std::string* error_string) { - LOGI("CdmEngine::GetDecryptHashError: %s", session_id.c_str()); + LOGI("Getting decrypt hash error: session_id = %s", session_id.c_str()); std::shared_ptr session; if (!session_map_.FindSession(session_id, &session)) { return SESSION_NOT_FOUND_20; @@ -1877,7 +1834,7 @@ bool CdmEngine::IsKeyLoaded(const KeyId& key_id) { bool CdmEngine::FindSessionForKey(const KeyId& key_id, CdmSessionId* session_id) { if (NULL == session_id) { - LOGE("CdmEngine::FindSessionForKey: session id not provided"); + LOGE("No session ID destination provided"); return false; } @@ -1976,7 +1933,8 @@ void CdmEngine::OnTimerEvent() { // called only once per update usage information period CdmResponseType status = (*iter)->UpdateUsageTableInformation(); if (NO_ERROR != status) { - LOGW("Update usage information failed: %d", status); + LOGW("UpdateUsageTableInformation failed: status = %d", + static_cast(status)); } else { has_usage_been_updated = true; } @@ -2073,17 +2031,14 @@ void CdmEngine::DeleteAllUsageReportsUponFactoryReset() { metrics_->GetCryptoMetrics() ->crypto_session_delete_all_usage_reports_.Increment(status); if (NO_ERROR != status) { - LOGW( - "CdmEngine::DeleteAllUsageReportsUponFactoryReset: " - "Fails to delete usage reports: %d", - status); + LOGW("Failed to delete usage reports: status = %d", + static_cast(status)); } } else { LOGW( - "CdmEngine::DeleteAllUsageReportsUponFactoryReset: " - "Fails to open crypto session: error=%d.\n" - "Usage reports are not removed after factory reset.", - status); + "Failed to open crypto session: status = %d\n" + "Usage reports are not removed after factory reset", + static_cast(status)); } } } diff --git a/libwvdrmengine/cdm/core/src/cdm_session.cpp b/libwvdrmengine/cdm/core/src/cdm_session.cpp index 9e3ee8e6..b5393823 100644 --- a/libwvdrmengine/cdm/core/src/cdm_session.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp @@ -89,7 +89,7 @@ CdmResponseType CdmSession::Init(CdmClientPropertySet* cdm_client_property_set, const CdmSessionId* forced_session_id, WvCdmEventListener* event_listener) { if (initialized_) { - LOGE("CdmSession::Init: Failed due to previous initialization"); + LOGE("Failed due to previous initialization"); return REINIT_ERROR; } @@ -114,7 +114,7 @@ CdmResponseType CdmSession::Init(CdmClientPropertySet* cdm_client_property_set, } if (!file_handle_->Init(security_level_)) { - LOGE("CdmSession::Init: Unable to initialize file handle"); + LOGE("Unable to initialize file handle"); return SESSION_FILE_HANDLE_INIT_ERROR; } @@ -178,7 +178,7 @@ CdmResponseType CdmSession::Init(CdmClientPropertySet* cdm_client_property_set, metrics_->SetSessionId(session_id_); if (session_id_.empty()) { - LOGE("CdmSession::Init: empty session ID"); + LOGE("Empty session ID"); return EMPTY_SESSION_ID; } if (cdm_client_property_set) @@ -211,7 +211,7 @@ CdmResponseType CdmSession::RestoreOfflineSession(const CdmKeySetId& key_set_id, CdmLicenseType license_type, int* error_detail) { if (!initialized_) { - LOGE("CdmSession::RestoreOfflineSession: not initialized"); + LOGE("CDM session not initialized"); return NOT_INITIALIZED_ERROR; } if (!key_set_id_.empty()) { @@ -232,10 +232,8 @@ CdmResponseType CdmSession::RestoreOfflineSession(const CdmKeySetId& key_set_id, &playback_start_time, &last_playback_time, &grace_period_end_time, &app_parameters_, &usage_entry_, &usage_entry_number_, &sub_error_code)) { - LOGE( - "CdmSession::RestoreOfflineSession: failed to retrieve license. " - "sub error: %d, key set id = %s", - sub_error_code, key_set_id.c_str()); + LOGE("Failed to retrieve license: sub_error_code = %d, key_set_id = %s", + static_cast(sub_error_code), key_set_id.c_str()); SetErrorDetail(error_detail, sub_error_code); return sub_error_code == DeviceFiles::kFileNotFound ? KEYSET_ID_NOT_FOUND_4 : GET_LICENSE_ERROR; @@ -251,10 +249,8 @@ CdmResponseType CdmSession::RestoreOfflineSession(const CdmKeySetId& key_set_id, // retry. if (!(license_type == kLicenseTypeRelease || license_state == DeviceFiles::kLicenseStateActive)) { - LOGE( - "CdmSession::RestoreOfflineSession: invalid offline license state = " - "%d, type = %d", - license_state, license_type); + LOGE("Invalid offline license state: license_state = %d, license_type = %d", + static_cast(license_state), static_cast(license_type)); return GET_RELEASED_LICENSE_ERROR; } @@ -269,10 +265,7 @@ CdmResponseType CdmSession::RestoreOfflineSession(const CdmKeySetId& key_set_id, crypto_session_.get(), usage_entry_, usage_entry_number_); crypto_metrics_->usage_table_header_load_entry_.Increment(sts); if (sts != NO_ERROR) { - LOGE( - "CdmSession::RestoreOfflineSession: failed to load usage entry = " - "%d", - sts); + LOGE("Failed to load usage entry: status = %d", static_cast(sts)); return sts; } } @@ -302,16 +295,11 @@ CdmResponseType CdmSession::RestoreOfflineSession(const CdmKeySetId& key_set_id, CdmResponseType sts = usage_table_header_->UpdateEntry(crypto_session_.get(), &usage_entry_); if (sts != NO_ERROR) { - LOGE( - "CdmSession::RestoreOfflineSession failed to update usage entry = " - "%d", - sts); + LOGE("Failed to update usage entry: status = %d", static_cast(sts)); return sts; } if (!StoreLicense(license_state, error_detail)) { - LOGW( - "CdmSession::RestoreUsageSession: unable to save updated usage " - "info"); + LOGW("Unable to save updated usage info"); } } @@ -324,7 +312,7 @@ CdmResponseType CdmSession::RestoreOfflineSession(const CdmKeySetId& key_set_id, CdmResponseType CdmSession::RestoreUsageSession( const DeviceFiles::CdmUsageData& usage_data, int* error_detail) { if (!initialized_) { - LOGE("CdmSession::RestoreUsageSession: not initialized"); + LOGE("CDM session not initialized"); return NOT_INITIALIZED_ERROR; } if (!key_set_id_.empty()) { @@ -344,8 +332,7 @@ CdmResponseType CdmSession::RestoreUsageSession( usage_entry_number_); crypto_metrics_->usage_table_header_load_entry_.Increment(sts); if (sts != NO_ERROR) { - LOGE("CdmSession::RestoreUsageSession: failed to load usage entry = %d", - sts); + LOGE("Failed to load usage entry: status = %d", static_cast(sts)); return sts; } } @@ -362,14 +349,11 @@ CdmResponseType CdmSession::RestoreUsageSession( sts = usage_table_header_->UpdateEntry(crypto_session_.get(), &usage_entry_); if (sts != NO_ERROR) { - LOGE("CdmSession::RestoreUsageSession: failed to update usage entry: %d", - sts); + LOGE("Failed to update usage entry: status = %d", static_cast(sts)); return sts; } if (!UpdateUsageInfo()) { - LOGW( - "CdmSession::RestoreUsageSession: unable to save updated usage " - "info"); + LOGW("Unable to save updated usage info"); } } @@ -399,12 +383,12 @@ CdmResponseType CdmSession::GenerateKeyRequestInternal( const InitializationData& init_data, CdmLicenseType license_type, const CdmAppParameterMap& app_parameters, CdmKeyRequest* key_request) { if (!initialized_) { - LOGE("CdmSession::GenerateKeyRequest: not initialized"); + LOGE("CDM session not initialized"); return NOT_INITIALIZED_ERROR; } if (!key_request) { - LOGE("CdmSession::GenerateKeyRequest: No output destination provided"); + LOGE("No output destination provided"); return PARAMETER_NULL; } @@ -430,8 +414,7 @@ CdmResponseType CdmSession::GenerateKeyRequestInternal( case kLicenseTypeEmbeddedKeyData: return license_parser_->HandleEmbeddedKeyData(init_data); default: - LOGE("CdmSession::GenerateKeyRequest: unrecognized license type: %ld", - license_type); + LOGE("Unrecognized license type: %d", static_cast(license_type)); return INVALID_LICENSE_TYPE; } @@ -452,16 +435,15 @@ CdmResponseType CdmSession::GenerateKeyRequestInternal( key_request->type = kKeyRequestTypeInitial; if (!init_data.is_supported()) { - LOGW("CdmSession::GenerateKeyRequest: unsupported init data type (%s)", - init_data.type().c_str()); + LOGW("Unsupported init data type: %s", init_data.type().c_str()); return UNSUPPORTED_INIT_DATA; } if (init_data.IsEmpty() && !license_parser_->HasInitData()) { - LOGW("CdmSession::GenerateKeyRequest: init data absent"); + LOGW("Init data absent"); return INIT_DATA_NOT_FOUND; } if (is_offline_ && key_set_id_.empty()) { - LOGE("CdmSession::GenerateKeyRequest: Unable to generate key set ID"); + LOGE("Unable to generate key set ID"); return KEY_REQUEST_ERROR_1; } @@ -490,7 +472,7 @@ CdmResponseType CdmSession::AddKey(const CdmKeyResponse& key_response) { // AddKeyInternal() - Accept license response and extract key info. CdmResponseType CdmSession::AddKeyInternal(const CdmKeyResponse& key_response) { if (!initialized_) { - LOGE("CdmSession::AddKey: not initialized"); + LOGE("Not initialized"); return NOT_INITIALIZED_ERROR; } @@ -535,8 +517,8 @@ CdmResponseType CdmSession::AddKeyInternal(const CdmKeyResponse& key_response) { usage_entry_number_, file_handle_.get(), crypto_metrics_); crypto_metrics_->usage_table_header_delete_entry_.Increment(delete_sts); if (delete_sts != NO_ERROR) { - LOGW("CdmSession::AddKey: Delete usage entry failed = %d", - delete_sts); + LOGW("Delete usage entry failed: status = %d", + static_cast(delete_sts)); } } } @@ -546,9 +528,9 @@ CdmResponseType CdmSession::AddKeyInternal(const CdmKeyResponse& key_response) { license_received_ = true; key_response_ = key_response; - LOGV("AddKey: provider_session_token (size=%d) =%s", - license_parser_->provider_session_token().size(), - license_parser_->provider_session_token().c_str()); + LOGV("Key added: provider_session_token = %s (size = %zu)", + license_parser_->provider_session_token().c_str(), + license_parser_->provider_session_token().size()); if (is_offline_ || has_provider_session_token()) { if (has_provider_session_token() && @@ -571,7 +553,7 @@ CdmResponseType CdmSession::AddKeyInternal(const CdmKeyResponse& key_response) { CdmResponseType CdmSession::QueryStatus(CdmQueryMap* query_response) { if (!initialized_) { - LOGE("CdmSession::QueryStatus: not initialized"); + LOGE("CDM session not initialized"); return NOT_INITIALIZED_ERROR; } @@ -611,7 +593,7 @@ CdmResponseType CdmSession::QueryKeyAllowedUsage( CdmResponseType CdmSession::QueryOemCryptoSessionId( CdmQueryMap* query_response) { if (!initialized_) { - LOGE("CdmSession::QueryOemCryptoSessionId: not initialized"); + LOGE("Not initialized"); return NOT_INITIALIZED_ERROR; } @@ -668,7 +650,7 @@ CdmResponseType CdmSession::Decrypt(const CdmDecryptionParameters& params) { // session keys. CdmResponseType CdmSession::GenerateRenewalRequest(CdmKeyRequest* key_request) { if (!initialized_) { - LOGE("CdmSession::GenerateRenewalRequest: not initialized"); + LOGE("CDM session not initialized"); return NOT_INITIALIZED_ERROR; } CdmResponseType status = license_parser_->PrepareKeyUpdateRequest( @@ -689,7 +671,7 @@ CdmResponseType CdmSession::GenerateRenewalRequest(CdmKeyRequest* key_request) { // RenewKey() - Accept renewal response and update key info. CdmResponseType CdmSession::RenewKey(const CdmKeyResponse& key_response) { if (!initialized_) { - LOGE("CdmSession::RenewKey: not initialized"); + LOGE("CDM session not initialized"); return NOT_INITIALIZED_ERROR; } CdmResponseType sts = @@ -711,7 +693,7 @@ CdmResponseType CdmSession::RenewKey(const CdmKeyResponse& key_response) { CdmResponseType CdmSession::GenerateReleaseRequest(CdmKeyRequest* key_request) { if (!initialized_) { - LOGE("CdmSession::GenerateReleaseRequest: not initialized"); + LOGE("CDM session not initialized"); return NOT_INITIALIZED_ERROR; } is_release_ = true; @@ -730,10 +712,7 @@ CdmResponseType CdmSession::GenerateReleaseRequest(CdmKeyRequest* key_request) { usage_table_header_->UpdateEntry(crypto_session_.get(), &usage_entry_); if (status != NO_ERROR) { - LOGE( - "CdmSession::GenerateReleaseRequest: Update usage entry failed = " - "%d", - status); + LOGE("Update usage entry failed: status = %d", static_cast(status)); return status; } } @@ -756,7 +735,7 @@ CdmResponseType CdmSession::GenerateReleaseRequest(CdmKeyRequest* key_request) { // ReleaseKey() - Accept release response and release license. CdmResponseType CdmSession::ReleaseKey(const CdmKeyResponse& key_response) { if (!initialized_) { - LOGE("CdmSession::ReleaseKey: not initialized"); + LOGE("CDM session not initialized"); return NOT_INITIALIZED_ERROR; } CdmResponseType sts = @@ -771,12 +750,12 @@ CdmResponseType CdmSession::ReleaseKey(const CdmKeyResponse& key_response) { CdmResponseType CdmSession::DeleteUsageEntry(uint32_t usage_entry_number) { if (!initialized_) { - LOGE("CdmSession::DeleteUsageEntry: not initialized"); + LOGE("CDM session not initialized"); return NOT_INITIALIZED_ERROR; } if (usage_support_type_ != kUsageEntrySupport) { - LOGE("CdmSession::DeleteUsageEntry: Unexpected usage type supported: %d", - usage_support_type_); + LOGE("Unexpected usage support type: %d", + static_cast(usage_support_type_)); return INCORRECT_USAGE_SUPPORT_TYPE_1; } @@ -799,7 +778,7 @@ CdmResponseType CdmSession::DeleteUsageEntry(uint32_t usage_entry_number) { } if (usage_table_header_ == NULL) { - LOGE("CdmSession::DeleteUsageEntry: Usage table header unavailable"); + LOGE("Usage table header unavailable"); return INCORRECT_USAGE_SUPPORT_TYPE_1; } @@ -825,7 +804,7 @@ CdmSessionId CdmSession::GenerateSessionId() { bool CdmSession::GenerateKeySetId(CdmKeySetId* key_set_id) { if (!key_set_id) { - LOGW("CdmSession::GenerateKeySetId: key set id destination not provided"); + LOGW("Key set ID destination not provided"); return false; } @@ -852,23 +831,23 @@ bool CdmSession::GenerateKeySetId(CdmKeySetId* key_set_id) { CdmResponseType CdmSession::StoreLicense() { if (is_temporary_) { - LOGE("CdmSession::StoreLicense: Session type prohibits storage."); + LOGE("Session type prohibits storage"); return STORAGE_PROHIBITED; } if (is_offline_) { if (key_set_id_.empty()) { - LOGE("CdmSession::StoreLicense: No key set ID"); + LOGE("No key set ID"); return EMPTY_KEYSET_ID; } if (!license_parser_->is_offline()) { - LOGE("CdmSession::StoreLicense: License policy prohibits storage."); + LOGE("License policy prohibits storage"); return OFFLINE_LICENSE_PROHIBITED; } if (!StoreLicense(DeviceFiles::kLicenseStateActive, nullptr)) { - LOGE("CdmSession::StoreLicense: Unable to store license"); + LOGE("Unable to store license"); return STORE_LICENSE_ERROR_1; } return NO_ERROR; @@ -877,7 +856,7 @@ CdmResponseType CdmSession::StoreLicense() { std::string provider_session_token = license_parser_->provider_session_token(); if (provider_session_token.empty()) { - LOGE("CdmSession::StoreLicense: No provider session token and not offline"); + LOGE("No provider session token and not offline"); return STORE_LICENSE_ERROR_2; } @@ -887,7 +866,7 @@ CdmResponseType CdmSession::StoreLicense() { provider_session_token, key_request_, key_response_, DeviceFiles::GetUsageInfoFileName(app_id), key_set_id_, usage_entry_, usage_entry_number_)) { - LOGE("CdmSession::StoreLicense: Unable to store usage info"); + LOGE("Unable to store usage info"); // Usage info file is corrupt. Delete current usage entry and file. switch (usage_support_type_) { case kUsageEntrySupport: @@ -898,8 +877,8 @@ CdmResponseType CdmSession::StoreLicense() { crypto_session_->UpdateUsageInformation(); break; default: - LOGW("CdmSession::StoreLicense: unexpected usage support type: %d", - usage_support_type_); + LOGW("Unexpected usage support type: %d", + static_cast(usage_support_type_)); break; } std::vector provider_session_tokens; @@ -1030,10 +1009,10 @@ CdmResponseType CdmSession::UpdateUsageEntryInformation() { if (usage_support_type_ != kUsageEntrySupport || !has_provider_session_token() || usage_table_header_ == NULL) { LOGE( - "CdmSession::UpdateUsageEntryInformation: Unexpected state, " - "usage support type: %d, PST present: %s, usage table header available" - ": %s", - usage_support_type_, has_provider_session_token() ? "yes" : "no", + "Unexpected state: usage support type = %d, PST present = %s, " + "usage table header available = %s", + static_cast(usage_support_type_), + has_provider_session_token() ? "yes" : "no", usage_table_header_ == NULL ? "no" : "yes"); return INCORRECT_USAGE_SUPPORT_TYPE_2; } @@ -1064,7 +1043,7 @@ CdmResponseType CdmSession::GenericEncrypt(const std::string& in_buffer, CdmEncryptionAlgorithm algorithm, std::string* out_buffer) { if (!out_buffer) { - LOGE("CdmSession::GenericEncrypt: No output destination provided"); + LOGE("No output destination provided"); return PARAMETER_NULL; } CdmResponseType sts; @@ -1081,7 +1060,7 @@ CdmResponseType CdmSession::GenericDecrypt(const std::string& in_buffer, CdmEncryptionAlgorithm algorithm, std::string* out_buffer) { if (!out_buffer) { - LOGE("CdmSession::GenericDecrypt: No output destination provided"); + LOGE("No output destination provided"); return PARAMETER_NULL; } CdmResponseType sts; @@ -1097,7 +1076,7 @@ CdmResponseType CdmSession::GenericSign(const std::string& message, CdmSigningAlgorithm algorithm, std::string* signature) { if (!signature) { - LOGE("CdmSession::GenericSign: No output destination provided"); + LOGE("No output destination provided"); return PARAMETER_NULL; } CdmResponseType sts;