From 71cf45fb3fa9bc324bcae1c6a79683ad34dab2c5 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Sat, 6 Mar 2021 23:53:49 -0800 Subject: [PATCH] Throw DeniedByServerException when provisioning detects a revoked device [ Merge of http://go/wvgerrit/117267 ] This includes some clang-format corrections that were missed in the original merge from wvgerrit. Bug: 174174765 Test: WvCdmRequestLicenseTest.ProvisioningRevocationTest, WV unit/integration tests Change-Id: Ifd16ab51eb89530fa5e0b91acc42f30864246d38 --- libwvdrmengine/cdm/core/src/certificate_provisioning.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp index 6d177b6e..a957ab95 100644 --- a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp +++ b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp @@ -118,7 +118,8 @@ using video_widevine::ProvisioningRequest; using video_widevine::ProvisioningResponse; using video_widevine::SignedDrmDeviceCertificate; using video_widevine::SignedProvisioningMessage; -using video_widevine::SignedProvisioningMessage_ProvisioningProtocolVersion_VERSION_1_1; +using video_widevine:: + SignedProvisioningMessage_ProvisioningProtocolVersion_VERSION_1_1; CdmResponseType CertificateProvisioning::Init( const std::string& service_certificate) { @@ -407,8 +408,8 @@ CdmResponseType CertificateProvisioning::HandleProvisioningResponse( case ProvisioningResponse::REVOKED_DEVICE_CREDENTIALS: case ProvisioningResponse::REVOKED_DEVICE_SERIES: return DEVICE_REVOKED; - default: - return CERT_PROVISIONING_RESPONSE_ERROR_10; + default: + return CERT_PROVISIONING_RESPONSE_ERROR_10; } }