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

Modify Level 3 full decrypt path testing for 15.1

Browse Source 
Merge of http://go/wvgerrit/68986
Bug: b/120797208
Test: Android + Linux unit tests

OEMCrypto v15.1 introduced changes to full decrypt path testing.
This CL reflects those changes for the Level 3 code, including
removing InitializeDecryptHash and changes to error reporting.

Change-Id: I09cec6743524d326cb1a6c3ba4dd1764dbefff5f
This commit is contained in:
Srujan Gaddam
2018-12-19 19:26:27 -08:00
parent 9c95e4caae
commit ff307a7c0e
8 changed files with 476042 additions and 476185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -280,8 +280,6 @@ typedef uint32_t (*L1_GetAnalogOutputFlags_t)(void);
typedef const char* (*L1_BuildInformation_t)(void);
typedef uint32_t (*L1_ResourceRatingTier_t)(void);
typedef uint32_t (*L1_SupportsDecryptHash_t)(void);
typedef OEMCryptoResult (*L1_InitializeDecryptHash_t)(
OEMCrypto_SESSION session);
typedef OEMCryptoResult (*L1_SetDecryptHash_t)(OEMCrypto_SESSION session,
uint32_t frame_number,
const uint8_t* hash,
@@ -359,7 +357,6 @@ struct FunctionPointers {
L1_BuildInformation_t BuildInformation;
L1_ResourceRatingTier_t ResourceRatingTier;
L1_SupportsDecryptHash_t SupportsDecryptHash;
L1_InitializeDecryptHash_t InitializeDecryptHash;
L1_SetDecryptHash_t SetDecryptHash;
L1_GetHashErrorCode_t GetHashErrorCode;
@@ -953,7 +950,6 @@ class Adapter {
level3_.CopyOldUsageEntry = Level3_CopyOldUsageEntry;
level3_.CreateOldUsageEntry = Level3_CreateOldUsageEntry;
level3_.SupportsDecryptHash = Level3_SupportsDecryptHash;
level3_.InitializeDecryptHash = Level3_InitializeDecryptHash;
level3_.SetDecryptHash = Level3_SetDecryptHash;
level3_.GetHashErrorCode = Level3_GetHashErrorCode;
// clang-format on