From e4c7bc38f8101eafcb621ef4dd6a483fb2c5d51f Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Wed, 15 May 2019 11:38:33 -0700 Subject: [PATCH] Address review comments for OEMCrypto Build Information Merge of http://go/wvgerrit/78683 There were some review comments in http://go/wvgerrit/78683 that came in after the code was merged to the qt-dev branch. This CL addresses them on the master branch. Test: unit tests. Bug: 129070445 --- .../cdm/core/src/client_identification.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/client_identification.cpp b/libwvdrmengine/cdm/core/src/client_identification.cpp index 4920e60e..07a52323 100644 --- a/libwvdrmengine/cdm/core/src/client_identification.cpp +++ b/libwvdrmengine/cdm/core/src/client_identification.cpp @@ -150,7 +150,12 @@ CdmResponseType ClientIdentification::Prepare( client_info->set_name(kKeyOemCryptoSecurityPatchLevel); client_info->set_value( std::to_string((uint32_t)crypto_session_->GetSecurityPatchLevel())); - + std::string oec_build_info; + if (crypto_session_->GetBuildInformation(&oec_build_info)) { + client_info = client_id->add_client_info(); + client_info->set_name(kKeyOemCryptoBuildInformation); + client_info->set_value(oec_build_info); + } if (!provider_client_token.empty()) { client_id->set_provider_client_token(provider_client_token); } @@ -273,12 +278,6 @@ CdmResponseType ClientIdentification::Prepare( client_capabilities->set_resource_rating_tier(tier); } } - std::string info; - if (crypto_session_->GetBuildInformation(&info)) { - client_info = client_id->add_client_info(); - client_info->set_name(kKeyOemCryptoBuildInformation); - client_info->set_value(info); - } } return NO_ERROR;