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

File util, generic crypto, and key query

Browse Source 
This CL merges several CLs from the widevine repo:

http://go/wvgerrit/18012 Add support for querying allowed usage for key.
http://go/wvgerrit/17971 Add per-origin storage.
http://go/wvgerrit/18152 Add OEMCrypto's generic crypto operations to CDM.
http://go/wvgerrit/17911 QueryKeyControlInfo => QueryOemCryptoSessionId

Note: numbering in wv_cdm_types.h was added in this CL and will be
back ported to wvgerrit in a future CL.

Change-Id: Idb9e9a67e94f62f25dc16c5307f75a08b3430b64
This commit is contained in:
Fred Gylys-Colwell
2016-09-14 12:44:09 -07:00
parent 24124ea6e3
commit eb3f8b786a
56 changed files with 4632 additions and 2083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libwvdrmengine/include/WVErrors.h
View File

@@ -185,8 +185,38 @@ enum {
kLoadUsageInfoMissing = ERROR_DRM_VENDOR_MIN + 171,
kSessionFileHandleInitError = ERROR_DRM_VENDOR_MIN + 172,
kIncorrectCryptoMode = ERROR_DRM_VENDOR_MIN + 173,
kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 173,
kInvalidParametersEng5 = ERROR_DRM_VENDOR_MIN + 174,
kSessionNotFound12 = ERROR_DRM_VENDOR_MIN + 175,
kKeyNotFound1 = ERROR_DRM_VENDOR_MIN + 176,
kKeyNotFound2 = ERROR_DRM_VENDOR_MIN + 177,
kKeyConflict1 = ERROR_DRM_VENDOR_MIN + 178,
kInvalidParametersEng6 = ERROR_DRM_VENDOR_MIN + 179,
kInvalidParametersEng7 = ERROR_DRM_VENDOR_MIN + 180,
kInvalidParametersEng8 = ERROR_DRM_VENDOR_MIN + 181,
kInvalidParametersEng9 = ERROR_DRM_VENDOR_MIN + 182,
kInvalidParametersEng10 = ERROR_DRM_VENDOR_MIN + 183,
kInvalidParametersEng11 = ERROR_DRM_VENDOR_MIN + 184,
kInvalidParametersEng12 = ERROR_DRM_VENDOR_MIN + 185,
kSessionNotFound13 = ERROR_DRM_VENDOR_MIN + 186,
kSessionNotFound14 = ERROR_DRM_VENDOR_MIN + 187,
kSessionNotFound15 = ERROR_DRM_VENDOR_MIN + 188,
kSessionNotFound16 = ERROR_DRM_VENDOR_MIN + 189,
kKeyNotFound3 = ERROR_DRM_VENDOR_MIN + 190,
kKeyNotFound4 = ERROR_DRM_VENDOR_MIN + 191,
kKeyNotFound5 = ERROR_DRM_VENDOR_MIN + 192,
kKeyNotFound6 = ERROR_DRM_VENDOR_MIN + 193,
kKeyError1 = ERROR_DRM_VENDOR_MIN + 194,
kKeyError2 = ERROR_DRM_VENDOR_MIN + 195,
kKeyError3 = ERROR_DRM_VENDOR_MIN + 196,
kKeyError4 = ERROR_DRM_VENDOR_MIN + 197,
kInvalidParametersEng13 = ERROR_DRM_VENDOR_MIN + 198,
kInvalidParametersEng14 = ERROR_DRM_VENDOR_MIN + 199,
kInvalidParametersEng15 = ERROR_DRM_VENDOR_MIN + 200,
kInvalidParametersEng16 = ERROR_DRM_VENDOR_MIN + 201,
// This should always follow the last error code.
// The offset value should be updated each time a new error code is added.
kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 201,
// Used by crypto test mode
kErrorTestMode = ERROR_DRM_VENDOR_MAX,

32
libwvdrmengine/include/mapErrors-inl.h
View File

@@ -363,6 +363,38 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
return android::ERROR_DRM_CANNOT_HANDLE;
case wvcdm::INSUFFICIENT_OUTPUT_PROTECTION:
return android::ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION;
case wvcdm::SESSION_NOT_FOUND_13:
return kSessionNotFound13;
case wvcdm::SESSION_NOT_FOUND_14:
return kSessionNotFound14;
case wvcdm::SESSION_NOT_FOUND_15:
return kSessionNotFound15;
case wvcdm::SESSION_NOT_FOUND_16:
return kSessionNotFound16;
case wvcdm::KEY_NOT_FOUND_3:
return kKeyNotFound3;
case wvcdm::KEY_NOT_FOUND_4:
return kKeyNotFound4;
case wvcdm::KEY_NOT_FOUND_5:
return kKeyNotFound5;
case wvcdm::KEY_NOT_FOUND_6:
return kKeyNotFound6;
case wvcdm::KEY_ERROR_1:
return kKeyError1;
case wvcdm::KEY_ERROR_2:
return kKeyError2;
case wvcdm::KEY_ERROR_3:
return kKeyError3;
case wvcdm::KEY_ERROR_4:
return kKeyError4;
case wvcdm::INVALID_PARAMETERS_ENG_13:
return kInvalidParametersEng13;
case wvcdm::INVALID_PARAMETERS_ENG_14:
return kInvalidParametersEng14;
case wvcdm::INVALID_PARAMETERS_ENG_15:
return kInvalidParametersEng15;
case wvcdm::INVALID_PARAMETERS_ENG_16:
return kInvalidParametersEng16;
case wvcdm::UNUSED_1:
case wvcdm::UNUSED_2:
case wvcdm::UNUSED_3: