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

Merge "Make os_version optional for StrongBox" am: fc3fdf1a96 am: be60ee6543 am: f402fd2a55

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

Change-Id: I134da6e95cece38fde1e8dbf5bb851395da057f6
This commit is contained in:
Treehugger Robot
2022-02-08 23:39:27 +00:00
committed by Automerger Merge Worker
parent a04f9a4058 f402fd2a55
commit fa59f35bce
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
security/keymint/aidl/android/hardware/security/keymint/DeviceInfo.aidl
View File

@@ -40,7 +40,9 @@ parcelable DeviceInfo {
* "vb_state" : "green" / "yellow" / "orange", // Taken from the AVB values * "vb_state" : "green" / "yellow" / "orange", // Taken from the AVB values
* "bootloader_state" : "locked" / "unlocked", // Taken from the AVB values * "bootloader_state" : "locked" / "unlocked", // Taken from the AVB values
* "vbmeta_digest": bstr, // Taken from the AVB values * "vbmeta_digest": bstr, // Taken from the AVB values
* "os_version" : tstr, // Same as android.os.Build.VERSION.release * ? "os_version" : tstr, // Same as
* // android.os.Build.VERSION.release
* // Not optional for TEE.
* "system_patch_level" : uint, // YYYYMMDD * "system_patch_level" : uint, // YYYYMMDD
* "boot_patch_level" : uint, // YYYYMMDD * "boot_patch_level" : uint, // YYYYMMDD
* "vendor_patch_level" : uint, // YYYYMMDD * "vendor_patch_level" : uint, // YYYYMMDD

4
security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
View File

@@ -492,7 +492,6 @@ class CertificateRequestTest : public VtsRemotelyProvisionedComponentTests {
ASSERT_NE(allowList.find(deviceInfo->get("bootloader_state")->asTstr()->value()), ASSERT_NE(allowList.find(deviceInfo->get("bootloader_state")->asTstr()->value()),
allowList.end()); allowList.end());
checkType(deviceInfo, cppbor::BSTR, "vbmeta_digest"); checkType(deviceInfo, cppbor::BSTR, "vbmeta_digest");
checkType(deviceInfo, cppbor::TSTR, "os_version");
checkType(deviceInfo, cppbor::UINT, "system_patch_level"); checkType(deviceInfo, cppbor::UINT, "system_patch_level");
checkType(deviceInfo, cppbor::UINT, "boot_patch_level"); checkType(deviceInfo, cppbor::UINT, "boot_patch_level");
checkType(deviceInfo, cppbor::UINT, "vendor_patch_level"); checkType(deviceInfo, cppbor::UINT, "vendor_patch_level");
@@ -502,6 +501,9 @@ class CertificateRequestTest : public VtsRemotelyProvisionedComponentTests {
allowList = getAllowedSecurityLevels(); allowList = getAllowedSecurityLevels();
ASSERT_NE(allowList.find(deviceInfo->get("security_level")->asTstr()->value()), ASSERT_NE(allowList.find(deviceInfo->get("security_level")->asTstr()->value()),
allowList.end()); allowList.end());
if (deviceInfo->get("security_level")->asTstr()->value() == "tee") {
checkType(deviceInfo, cppbor::TSTR, "os_version");
}
break; break;
case 1: case 1:
checkType(deviceInfo, cppbor::TSTR, "security_level"); checkType(deviceInfo, cppbor::TSTR, "security_level");