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

Fix a few Vts failures in factory_upload_tool am: 2caa832158

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23753310

Change-Id: Id5bc17f2c2c690862afdc873cb10dec919bbc56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cong Lin
2023-06-23 23:23:56 +00:00
committed by Automerger Merge Worker
parent 8d2b7084e4 2caa832158
commit 3140bdd9f9
2 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libwvdrmengine/factory_upload_tool/android.hardware.security.keymint-service.widevine.xml
View File

@@ -1,6 +1,7 @@
<manifest version="1.0" type="device"> <manifest version="1.0" type="device">
<hal format="aidl"> <hal format="aidl">
<name>android.hardware.security.keymint</name> <name>android.hardware.security.keymint</name>
<version>3</version>
<fqname>IRemotelyProvisionedComponent/widevine</fqname> <fqname>IRemotelyProvisionedComponent/widevine</fqname>
</hal> </hal>
</manifest> </manifest>

37
libwvdrmengine/factory_upload_tool/src/WidevineRemotelyProvisionedComponent.cpp
View File

@@ -28,6 +28,8 @@
#include <variant> #include <variant>
#include "log.h"
namespace aidl::android::hardware::security::keymint { namespace aidl::android::hardware::security::keymint {
using ::std::string; using ::std::string;
@@ -77,7 +79,8 @@ ScopedAStatus WidevineRemotelyProvisionedComponent::getHardwareInfo(
RpcHardwareInfo* info) { RpcHardwareInfo* info) {
info->versionNumber = 3; info->versionNumber = 3;
info->rpcAuthorName = "Google"; info->rpcAuthorName = "Google";
info->supportedEekCurve = RpcHardwareInfo::CURVE_25519; info->supportedEekCurve = RpcHardwareInfo::CURVE_NONE;
info->supportedNumKeysInCsr = RpcHardwareInfo::MIN_SUPPORTED_NUM_KEYS_IN_CSR;
info->uniqueId = "Widevine Implementation"; info->uniqueId = "Widevine Implementation";
return ScopedAStatus::ok(); return ScopedAStatus::ok();
} }
@@ -85,33 +88,17 @@ ScopedAStatus WidevineRemotelyProvisionedComponent::getHardwareInfo(
ScopedAStatus WidevineRemotelyProvisionedComponent::generateEcdsaP256KeyPair( ScopedAStatus WidevineRemotelyProvisionedComponent::generateEcdsaP256KeyPair(
bool /* testMode */, MacedPublicKey* /* macedPublicKey */, bool /* testMode */, MacedPublicKey* /* macedPublicKey */,
bytevec* /* privateKeyHandle */) { bytevec* /* privateKeyHandle */) {
return Status("Invalid operation."); return Status(
"Invalid operation: generateEcdsaP256KeyPair() is not supported.");
} }
ScopedAStatus WidevineRemotelyProvisionedComponent::generateCertificateRequest( ScopedAStatus WidevineRemotelyProvisionedComponent::generateCertificateRequest(
bool testMode, const vector<MacedPublicKey>& keysToSign, bool /* testMode */, const vector<MacedPublicKey>& /* keysToSign */,
const bytevec& endpointEncCertChain, const bytevec& /* challenge */, const bytevec& /* endpointEncCertChain */, const bytevec& /* challenge */,
DeviceInfo* deviceInfo, ProtectedData* protectedData, DeviceInfo* /* deviceInfo */, ProtectedData* /* protectedData */,
bytevec* /* keysToSignMac */) { bytevec* /* keysToSignMac */) {
if (!keysToSign.empty()) { return Status(IRemotelyProvisionedComponent::STATUS_REMOVED,
return Status("Invalid operation: Keys to sign must be empty."); "generateCertificateRequestV1 not supported.");
}
if (deviceInfo == nullptr) {
return Status("Parameter deviceInfo must not be null.");
}
if (protectedData == nullptr) {
return Status("Parameter protectedData must not be null.");
}
if (provisioner_ == nullptr) {
provisioner_ = std::make_unique<widevine::WidevineProvisioner>();
}
if (!provisioner_->GenerateCertificateRequest(testMode, endpointEncCertChain,
deviceInfo->deviceInfo,
protectedData->protectedData)) {
return Status("Failed to generate certificate request.");
}
return ScopedAStatus::ok();
} }
ScopedAStatus ScopedAStatus
@@ -119,7 +106,7 @@ WidevineRemotelyProvisionedComponent::generateCertificateRequestV2(
const std::vector<MacedPublicKey>& keysToSign, const std::vector<MacedPublicKey>& keysToSign,
const std::vector<uint8_t>& challenge, std::vector<uint8_t>* csr) { const std::vector<uint8_t>& challenge, std::vector<uint8_t>* csr) {
if (!keysToSign.empty()) { if (!keysToSign.empty()) {
return Status("Invalid operation: Keys to sign must be empty."); LOGW("Keys to sign should be empty.");
} }
if (csr == nullptr) { if (csr == nullptr) {
return Status("Parameter csr must not be null."); return Status("Parameter csr must not be null.");