commit 8304a9040c60150504376aad87ba334e8afd3605
author Bartosz Fabianowski <bartfab@google.com> Thu Apr 20 04:47:40 2017 +0200
committer Bartosz Fabianowski <bartfab@google.com> Thu Apr 20 04:47:44 2017 +0200
tree 7cc1e8880d5328c4add8a4b827fdce1f85d78bf3
parent de173893c8ec5cff3264ac36b2a48bf2b021bd53

Finish adding manufacturer and model to device ID attestation

This is a follow-up to change I5a9fd839497976cdb1e44cbe4a2d5b7730732b4c,
where manufacturer and model were added to the set of attestable device
IDs.

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

Change-Id: Ied4246f4fc490feb2093f04c268aab83c8e1326d

keymaster/3.0/default/KeymasterDevice.cpp

diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index 58102bb..9c7c860 100644
--- a/keymaster/3.0/default/KeymasterDevice.cpp
+++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -528,6 +528,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.