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

Merge "Give Nonce Error Explicit Name"

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2017-03-08 20:44:00 +00:00
committed by Android (Google) Code Review
parent 1322df2d28 14c3a3865a
commit 2dbc81318a
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/include/wv_cdm_types.h
View File

@@ -54,7 +54,7 @@ enum CdmResponseType {
CERT_PROVISIONING_GET_KEYBOX_ERROR_2, CERT_PROVISIONING_GET_KEYBOX_ERROR_2,
CERT_PROVISIONING_INVALID_CERT_TYPE, CERT_PROVISIONING_INVALID_CERT_TYPE,
CERT_PROVISIONING_REQUEST_ERROR_1, CERT_PROVISIONING_REQUEST_ERROR_1,
CERT_PROVISIONING_REQUEST_ERROR_2, /* 15 */ CERT_PROVISIONING_NONCE_GENERATION_ERROR, /* 15 */
CERT_PROVISIONING_REQUEST_ERROR_3, CERT_PROVISIONING_REQUEST_ERROR_3,
CERT_PROVISIONING_REQUEST_ERROR_4, CERT_PROVISIONING_REQUEST_ERROR_4,
CERT_PROVISIONING_RESPONSE_ERROR_1, CERT_PROVISIONING_RESPONSE_ERROR_1,

2
libwvdrmengine/cdm/core/src/certificate_provisioning.cpp
View File

@@ -178,7 +178,7 @@ CdmResponseType CertificateProvisioning::GetProvisioningRequest(
uint32_t nonce; uint32_t nonce;
if (!crypto_session_.GenerateNonce(&nonce)) { if (!crypto_session_.GenerateNonce(&nonce)) {
LOGE("GetProvisioningRequest: fails to generate a nonce"); LOGE("GetProvisioningRequest: fails to generate a nonce");
return CERT_PROVISIONING_REQUEST_ERROR_2; return CERT_PROVISIONING_NONCE_GENERATION_ERROR;
} }
// The provisioning server does not convert the nonce to uint32_t, it just // The provisioning server does not convert the nonce to uint32_t, it just

4
libwvdrmengine/cdm/core/test/cdm_engine_test.cpp
View File

@@ -84,7 +84,7 @@ class WvCdmEngineTest : public testing::Test {
for (int i = 0; i < 2; i++) { // Retry once if there is a nonce problem. for (int i = 0; i < 2; i++) { // Retry once if there is a nonce problem.
result = cdm_engine_.GetProvisioningRequest( result = cdm_engine_.GetProvisioningRequest(
cert_type, cert_authority, &prov_request, &provisioning_server_url); cert_type, cert_authority, &prov_request, &provisioning_server_url);
if (result == LICENSE_REQUEST_NONCE_GENERATION_ERROR) { if (result == CERT_PROVISIONING_NONCE_GENERATION_ERROR) {
LOGW("Woops. Nonce problem. Try again?"); LOGW("Woops. Nonce problem. Try again?");
sleep(1); sleep(1);
} else { } else {
@@ -140,7 +140,7 @@ class WvCdmEngineTest : public testing::Test {
CdmResponseType result = NO_ERROR; CdmResponseType result = NO_ERROR;
for (int i = 0; i < 2; i++) { // Retry once if there is a nonce problem. for (int i = 0; i < 2; i++) { // Retry once if there is a nonce problem.
result = cdm_engine_.GenerateRenewalRequest(session_id_, &request); result = cdm_engine_.GenerateRenewalRequest(session_id_, &request);
if (result == LICENSE_REQUEST_NONCE_GENERATION_ERROR) { if (result == LICENSE_RENEWAL_NONCE_GENERATION_ERROR) {
LOGW("Woops. Nonce problem. Try again?"); LOGW("Woops. Nonce problem. Try again?");
sleep(1); sleep(1);
} else { } else {

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

@@ -42,8 +42,8 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
case CERT_PROVISIONING_REQUEST_ERROR_1: case CERT_PROVISIONING_REQUEST_ERROR_1:
*os << "CERT_PROVISIONING_REQUEST_ERROR_1"; *os << "CERT_PROVISIONING_REQUEST_ERROR_1";
break; break;
case CERT_PROVISIONING_REQUEST_ERROR_2: case CERT_PROVISIONING_NONCE_GENERATION_ERROR:
*os << "CERT_PROVISIONING_REQUEST_ERROR_2"; *os << "CERT_PROVISIONING_NONCE_GENERATION_ERROR";
break; break;
case CERT_PROVISIONING_REQUEST_ERROR_3: case CERT_PROVISIONING_REQUEST_ERROR_3:
*os << "CERT_PROVISIONING_REQUEST_ERROR_3"; *os << "CERT_PROVISIONING_REQUEST_ERROR_3";

2
libwvdrmengine/include/WVErrors.h
View File

@@ -26,7 +26,7 @@ enum {
kCertProvisioningGetKeyboxError2 = ERROR_DRM_VENDOR_MIN + 10, kCertProvisioningGetKeyboxError2 = ERROR_DRM_VENDOR_MIN + 10,
kCertProvisioningInvalidCertType = ERROR_DRM_VENDOR_MIN + 11, kCertProvisioningInvalidCertType = ERROR_DRM_VENDOR_MIN + 11,
kCertProvisioningRequestError1 = ERROR_DRM_VENDOR_MIN + 12, kCertProvisioningRequestError1 = ERROR_DRM_VENDOR_MIN + 12,
kCertProvisioningRequestError2 = ERROR_DRM_VENDOR_MIN + 13, kCertProvisioningRequestNonceGenerationError = ERROR_DRM_VENDOR_MIN + 13,
kCertProvisioningRequestError3 = ERROR_DRM_VENDOR_MIN + 14, kCertProvisioningRequestError3 = ERROR_DRM_VENDOR_MIN + 14,
kCertProvisioningRequestError4 = ERROR_DRM_VENDOR_MIN + 15, kCertProvisioningRequestError4 = ERROR_DRM_VENDOR_MIN + 15,
kCertProvisioningResponseError1 = ERROR_DRM_VENDOR_MIN + 16, kCertProvisioningResponseError1 = ERROR_DRM_VENDOR_MIN + 16,

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

@@ -39,8 +39,8 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
return kCertProvisioningInvalidCertType; return kCertProvisioningInvalidCertType;
case wvcdm::CERT_PROVISIONING_REQUEST_ERROR_1: case wvcdm::CERT_PROVISIONING_REQUEST_ERROR_1:
return kCertProvisioningRequestError1; return kCertProvisioningRequestError1;
case wvcdm::CERT_PROVISIONING_REQUEST_ERROR_2: case wvcdm::CERT_PROVISIONING_NONCE_GENERATION_ERROR:
return kCertProvisioningRequestError2; return kCertProvisioningRequestNonceGenerationError;
case wvcdm::CERT_PROVISIONING_REQUEST_ERROR_3: case wvcdm::CERT_PROVISIONING_REQUEST_ERROR_3:
return kCertProvisioningRequestError3; return kCertProvisioningRequestError3;
case wvcdm::CERT_PROVISIONING_REQUEST_ERROR_4: case wvcdm::CERT_PROVISIONING_REQUEST_ERROR_4: