Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc3fdf1a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Make os_version optional for StrongBox"

parents 3baf9dae 9c28a1ed

security/keymint/aidl/android/hardware/security/keymint/DeviceInfo.aidl

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,9 @@ parcelable DeviceInfo { 
     *         "vb_state" : "green" / "yellow" / "orange",    // Taken from the AVB values

     *         "bootloader_state" : "locked" / "unlocked",    // 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

     *         "boot_patch_level" : uint,                     // YYYYMMDD

     *         "vendor_patch_level" : uint,                   // YYYYMMDD

security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

+3 −1
Original line number Diff line number Diff line
@@ -492,7 +492,6 @@ class CertificateRequestTest : public VtsRemotelyProvisionedComponentTests { 
                ASSERT_NE(allowList.find(deviceInfo->get("bootloader_state")->asTstr()->value()),

                          allowList.end());

                checkType(deviceInfo, cppbor::BSTR, "vbmeta_digest");

                checkType(deviceInfo, cppbor::TSTR, "os_version");

                checkType(deviceInfo, cppbor::UINT, "system_patch_level");

                checkType(deviceInfo, cppbor::UINT, "boot_patch_level");

                checkType(deviceInfo, cppbor::UINT, "vendor_patch_level");
@@ -502,6 +501,9 @@ class CertificateRequestTest : public VtsRemotelyProvisionedComponentTests { 
                allowList = getAllowedSecurityLevels();

                ASSERT_NE(allowList.find(deviceInfo->get("security_level")->asTstr()->value()),

                          allowList.end());

                if (deviceInfo->get("security_level")->asTstr()->value() == "tee") {

                    checkType(deviceInfo, cppbor::TSTR, "os_version");

                }

                break;

            case 1:

                checkType(deviceInfo, cppbor::TSTR, "security_level");