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

OEMCrypto v16.1

Browse Source 
Merge of http://go/wvgerrit/93404

This CL updates the Widevine CDM to support OEMCrypto v16.1

Test: Tested in 16.2 CL
Bug: 141247171
Change-Id: I69bd993500f6fb63bf6010c8b0250dc7acc3d71b
This commit is contained in:
Fred Gylys-Colwell
2020-01-18 10:11:24 -08:00
parent 7e2619e379
commit 7665614b2e
132 changed files with 12331 additions and 9341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libwvdrmengine/include/WVErrors.h
View File

@@ -35,8 +35,6 @@ enum {
kCertProvisioningResponseError2 = ERROR_DRM_VENDOR_MIN + 17,
kCertProvisioningResponseError3 = ERROR_DRM_VENDOR_MIN + 18,
kCertProvisioningResponseError4 = ERROR_DRM_VENDOR_MIN + 19,
kCertProvisioningResponseError5 = ERROR_DRM_VENDOR_MIN + 20,
kCertProvisioningResponseError6 = ERROR_DRM_VENDOR_MIN + 21,
kCertProvisioningResponseError7 = ERROR_DRM_VENDOR_MIN + 22,
kCertProvisioningResponseError8 = ERROR_DRM_VENDOR_MIN + 23,
kDeviceCertificateError1 = ERROR_DRM_VENDOR_MIN + 30,
@@ -282,10 +280,15 @@ enum {
kSignatureNotFound2 = ERROR_DRM_VENDOR_MIN + 297,
kSessionKeysNotFound2 = ERROR_DRM_VENDOR_MIN + 298,
kUsageInvalidParameters2 = ERROR_DRM_VENDOR_MIN + 299,
kCoreMessageNotFound = ERROR_DRM_VENDOR_MIN + 300,
kInvalidSession2 = ERROR_DRM_VENDOR_MIN + 301,
kLoadProvisioningError = ERROR_DRM_VENDOR_MIN + 302,
kLoadLicenseError = ERROR_DRM_VENDOR_MIN + 303,
kLoadRenewalError = ERROR_DRM_VENDOR_MIN + 304,
// 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 + 299,
kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 304,
// Used by crypto test mode
kErrorTestMode = ERROR_DRM_VENDOR_MAX,

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

@@ -59,7 +59,6 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::SESSION_NOT_FOUND_8:
case wvcdm::SESSION_NOT_FOUND_9:
case wvcdm::SESSION_NOT_FOUND_10:
case wvcdm::SESSION_NOT_FOUND_17:
case wvcdm::SESSION_NOT_FOUND_18:
case wvcdm::SESSION_NOT_FOUND_19:
case wvcdm::SESSION_NOT_FOUND_20:
@@ -95,10 +94,6 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
return kCertProvisioningResponseError3;
case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_4:
return kCertProvisioningResponseError4;
case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_5:
return kCertProvisioningResponseError5;
case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_6:
return kCertProvisioningResponseError6;
case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_7:
return kCertProvisioningResponseError7;
case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_8:
@@ -117,6 +112,8 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
return kClientIdRsaInitError;
case wvcdm::COPY_OLD_USAGE_ENTRY_UNKNOWN_ERROR:
return kCopyOldUsageEntryUnknownError;
case wvcdm::CORE_MESSAGE_NOT_FOUND:
return kCoreMessageNotFound;
case wvcdm::CREATE_USAGE_ENTRY_UNKNOWN_ERROR:
return kCreateUsageEntryUnknownError;
case wvcdm::CREATE_USAGE_TABLE_ERROR:
@@ -285,6 +282,8 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
return kInvalidQueryKey;
case wvcdm::INVALID_SESSION_1:
return kInvalidSession1;
case wvcdm::INVALID_SESSION_2:
return kInvalidSession2;
case wvcdm::INVALID_SESSION_ID:
return kInvalidSessionId;
case wvcdm::INVALID_USAGE_ENTRY_NUMBER_MODIFICATION:
@@ -363,6 +362,12 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
return kLoadEntitledContentKeysError;
case wvcdm::LOAD_KEY_ERROR:
return kLoadKeyError;
case wvcdm::LOAD_LICENSE_ERROR:
return kLoadLicenseError;
case wvcdm::LOAD_PROVISIONING_ERROR:
return kLoadProvisioningError;
case wvcdm::LOAD_RENEWAL_ERROR:
return kLoadRenewalError;
case wvcdm::LOAD_SYSTEM_ID_ERROR:
return kLoadSystemIdError;
case wvcdm::LOAD_USAGE_ENTRY_GENERATION_SKEW:
@@ -581,7 +586,6 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::NOT_IMPLEMENTED_ERROR:
case wvcdm::GET_SRM_VERSION_ERROR:
case wvcdm::REWRAP_DEVICE_RSA_KEY_ERROR:
case wvcdm::REWRAP_DEVICE_RSA_KEY_30_ERROR:
case wvcdm::SERVICE_CERTIFICATE_PROVIDER_ID_EMPTY:
case wvcdm::INVALID_SRM_LIST:
return android::ERROR_DRM_UNKNOWN;