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

55
libwvdrmengine/cdm/core/test/test_printers.cpp
View File

@@ -56,12 +56,6 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
case CERT_PROVISIONING_RESPONSE_ERROR_4:
*os << "CERT_PROVISIONING_RESPONSE_ERROR_4";
break;
case CERT_PROVISIONING_RESPONSE_ERROR_5:
*os << "CERT_PROVISIONING_RESPONSE_ERROR_5";
break;
case CERT_PROVISIONING_RESPONSE_ERROR_6:
*os << "CERT_PROVISIONING_RESPONSE_ERROR_6";
break;
case CERT_PROVISIONING_RESPONSE_ERROR_7:
*os << "CERT_PROVISIONING_RESPONSE_ERROR_7";
break;
@@ -89,6 +83,9 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
case COPY_OLD_USAGE_ENTRY_UNKNOWN_ERROR:
*os << "COPY_OLD_USAGE_ENTRY_UNKNOWN_ERROR";
break;
case CORE_MESSAGE_NOT_FOUND:
*os << "CORE_MESSAGE_NOT_FOUND";
break;
case CREATE_USAGE_ENTRY_UNKNOWN_ERROR:
*os << "CREATE_USAGE_ENTRY_UNKNOWN_ERROR";
break;
@@ -395,6 +392,9 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
case INVALID_SESSION_1:
*os << "INVALID_SESSION_1";
break;
case INVALID_SESSION_2:
*os << "INVALID_SESSION_2";
break;
case INVALID_SESSION_ID:
*os << "INVALID_SESSION_ID";
break;
@@ -533,6 +533,15 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
case LOAD_KEY_ERROR:
*os << "LOAD_KEY_ERROR";
break;
case LOAD_LICENSE_ERROR:
*os << "LOAD_LICENSE_ERROR";
break;
case LOAD_PROVISIONING_ERROR:
*os << "LOAD_PROVISIONING_ERROR";
break;
case LOAD_RENEWAL_ERROR:
*os << "LOAD_RENEWAL_ERROR";
break;
case LOAD_SRM_ERROR:
*os << "LOAD_SRM_ERROR";
break;
@@ -710,9 +719,6 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
case RESTORE_OFFLINE_LICENSE_ERROR_2:
*os << "RESTORE_OFFLINE_LICENSE_ERROR_2";
break;
case REWRAP_DEVICE_RSA_KEY_30_ERROR:
*os << "REWRAP_DEVICE_RSA_KEY_30_ERROR";
break;
case REWRAP_DEVICE_RSA_KEY_ERROR:
*os << "REWRAP_DEVICE_RSA_KEY_ERROR";
break;
@@ -779,9 +785,6 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
case SESSION_NOT_FOUND_16:
*os << "SESSION_NOT_FOUND_16";
break;
case SESSION_NOT_FOUND_17:
*os << "SESSION_NOT_FOUND_17";
break;
case SESSION_NOT_FOUND_18:
*os << "SESSION_NOT_FOUND_18";
break;
@@ -1141,6 +1144,34 @@ void PrintTo(const enum OEMCryptoResult& value, ::std::ostream* os) {
case OEMCrypto_ERROR_SYSTEM_INVALIDATED:
*os << "SYSTEM_INVALIDATED";
break;
case OEMCrypto_ERROR_LICENSE_RELOAD:
*os << "LICENSE_RELOAD";
break;
case OEMCrypto_ERROR_MULTIPLE_USAGE_ENTRIES:
*os << "MULTIPLE_USAGE_ENTRIES";
break;
case OEMCrypto_WARNING_MIXED_OUTPUT_PROTECTION:
*os << "MIXED_OUTPUT_PROTECTION";
break;
// ODK Values.
case ODK_ERROR_CORE_MESSAGE:
*os << "CORE_MESSAGE";
break;
case ODK_SET_TIMER:
*os << "SET_TIMER";
break;
case ODK_DISABLE_TIMER:
*os << "DISABLE_TIMER";
break;
case ODK_TIMER_EXPIRED:
*os << "TIMER_EXPIRED";
break;
case ODK_UNSUPPORTED_API:
*os << "UNSUPPORTED_API";
break;
case ODK_STALE_RENEWAL:
*os << "STALE_RENEWAL";
break;
}
}