Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 06:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

identity: Don't pass invalid profileIds in VTS test. am: 1b8be7166f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1721603

Change-Id: I05b8f9dc2a8e63727ded9424fc0d8e2ba3b37c7d
This commit is contained in:
David Zeuthen
2021-06-01 22:24:36 +00:00
committed by Automerger Merge Worker
parent bb1b56ab1f 1b8be7166f
commit b23f14ebdb
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
identity/aidl/default/common/WritableIdentityCredential.cpp
View File

@@ -210,6 +210,15 @@ ndk::ScopedAStatus WritableIdentityCredential::beginAddEntry(
"numAccessControlProfileRemaining_ is not zero"));
}
// Ensure passed-in profile ids reference valid access control profiles
for (const int32_t id : accessControlProfileIds) {
if (accessControlProfileIds_.find(id) == accessControlProfileIds_.end()) {
return ndk::ScopedAStatus(AStatus_fromServiceSpecificErrorWithMessage(
IIdentityCredentialStore::STATUS_INVALID_DATA,
"An id in accessControlProfileIds references non-existing ACP"));
}
}
if (remainingEntryCounts_.size() == 0) {
return ndk::ScopedAStatus(AStatus_fromServiceSpecificErrorWithMessage(
IIdentityCredentialStore::STATUS_INVALID_DATA, "No more namespaces to add to"));

2
identity/aidl/vts/DeleteCredentialTests.cpp
View File

@@ -102,7 +102,7 @@ void DeleteCredentialTests::provisionData() {
ASSERT_TRUE(wc->addAccessControlProfile(1, {}, false, 0, 0, &sacp).isOk());
// Single entry - don't care about the returned encrypted data
ASSERT_TRUE(wc->beginAddEntry({0}, "ns", "Some Data", 1).isOk());
ASSERT_TRUE(wc->beginAddEntry({1}, "ns", "Some Data", 1).isOk());
vector<uint8_t> encryptedData;
ASSERT_TRUE(wc->addEntryValue({9}, &encryptedData).isOk());

2
identity/aidl/vts/ProveOwnershipTests.cpp
View File

@@ -102,7 +102,7 @@ void ProveOwnershipTests::provisionData() {
ASSERT_TRUE(wc->addAccessControlProfile(1, {}, false, 0, 0, &sacp).isOk());
// Single entry - don't care about the returned encrypted data
ASSERT_TRUE(wc->beginAddEntry({0}, "ns", "Some Data", 1).isOk());
ASSERT_TRUE(wc->beginAddEntry({1}, "ns", "Some Data", 1).isOk());
vector<uint8_t> encryptedData;
ASSERT_TRUE(wc->addEntryValue({9}, &encryptedData).isOk());