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

Commit dc039363 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add manufacturer and model to device ID attestation"

parents 3eebe248 2377553d

keymaster/3.0/default/KeymasterDevice.cpp

+2 −0
Original line number Diff line number Diff line
@@ -525,6 +525,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.

keymaster/3.0/types.hal

+4 −1
Original line number Diff line number Diff line
@@ -135,7 +135,10 @@ enum Tag : uint32_t { 
                                                    in attestation */

    ATTESTATION_ID_MEID = TagType:BYTES | 715,   /* Used to provide the device's MEID to be included

                                                    in attestation */



    ATTESTATION_ID_MANUFACTURER = TagType:BYTES | 716, /* Used to provide the device's manufacturer

                                                          name to be included in attestation */

    ATTESTATION_ID_MODEL = TagType:BYTES | 717,  /* Used to provide the device's model name to be

                                                    included in attestation */



    /* Tags used only to provide data to or receive data from operations */

    ASSOCIATED_DATA = TagType:BYTES | 1000, /* Used to provide associated data for AEAD modes. */