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

Commit d7b16e14 authored by Bartosz Fabianowski's avatar Bartosz Fabianowski Committed by android-build-merger
Browse files

Merge "Finish adding manufacturer and model to device ID attestation" into oc-dev 

am: 8fcab148

Change-Id: Ib568ef34a26d500e452887118338679388dfcf8e
parents d3503403 8fcab148

keymaster/3.0/default/KeymasterDevice.cpp

+2 −0
Original line number Diff line number Diff line
@@ -528,6 +528,8 @@ Return<void> KeymasterDevice::attestKey(const hidl_vec<uint8_t>& keyToAttest, 
        case Tag::ATTESTATION_ID_SERIAL:

        case Tag::ATTESTATION_ID_IMEI:

        case Tag::ATTESTATION_ID_MEID:

        case Tag::ATTESTATION_ID_MANUFACTURER:

        case Tag::ATTESTATION_ID_MODEL:

            // Device id attestation may only be supported if the device is able to permanently

            // destroy its knowledge of the ids. This device is unable to do this, so it must

            // never perform any device id attestation.