widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WVDrmPlugin changes to query device CSR payload for prov 4" into udc-widevine-dev

Browse Source
This commit is contained in:
Cong Lin
2023-07-21 06:23:26 +00:00
committed by Android (Google) Code Review
parent 51bcf4ba12 7318ab2ee0
commit c785d6f02f
4 changed files with 110 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libwvdrmengine/cdm/include/wv_content_decryption_module.h
View File

@@ -11,7 +11,7 @@
#include <memory>
#include <mutex>
#include <utils/RefBase.h>
#include "utils/RefBase.h"
#include "cdm_identifier.h"
#include "disallow_copy_and_assign.h"
@@ -135,6 +135,11 @@ class WvContentDecryptionModule : public android::RefBase, public TimerHandler {
virtual CdmResponseType QueryKeyStatus(const CdmSessionId& session_id,
CdmQueryMap* key_info);
// Query device CSR information for Provisioning 4.0
virtual CdmResponseType QueryDeviceSignedCsrPayload(
const std::string& challenge, const std::string& device_info,
std::string* value);
// Query OEMCrypto session ID
virtual CdmResponseType QueryOemCryptoSessionId(
const CdmSessionId& session_id, CdmQueryMap* response);

7
libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
View File

@@ -305,6 +305,13 @@ CdmResponseType WvContentDecryptionModule::QueryOemCryptoSessionId(
return cdm_engine->QueryOemCryptoSessionId(session_id, response);
}
CdmResponseType WvContentDecryptionModule::QueryDeviceSignedCsrPayload(
const std::string& challenge, const std::string& device_info,
std::string* value) {
CdmEngine* cdm_engine = EnsureCdmForIdentifier(kDefaultCdmIdentifier);
return cdm_engine->QueryDeviceSignedCsrPayload(challenge, device_info, value);
}
bool WvContentDecryptionModule::IsSecurityLevelSupported(
CdmSecurityLevel level) {
return CdmEngine::IsSecurityLevelSupported(level);