commit 2377553df2c46394029c43e4fb1eb2c500b434fe
author Bartosz Fabianowski <bartfab@google.com> Mon Mar 20 14:00:58 2017 +0100
committer Bartosz Fabianowski <bartfab@google.com> Mon Mar 20 14:01:03 2017 +0100
tree 4a37506346271f87b95abe1393945463b4cbded6
parent 9198e7bb30429614fbf8763e3bd2c651ebb77bab

Add manufacturer and model to device ID attestation

Discussions have shown that in addition to brand, device and product,
we should also allow devices to attest their manufacturer and model.

Bug: 36433192
Test: GTS com.google.android.gts.security.DeviceIdAttestationHostTest

Change-Id: I5a9fd839497976cdb1e44cbe4a2d5b7730732b4c

keymaster/3.0/default/KeymasterDevice.cpp

diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index 24cf53a..a40c0b7 100644
--- a/keymaster/3.0/default/KeymasterDevice.cpp
+++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -525,6 +525,8 @@
             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.