commit e90bc93d7352f7c5275dc5003ea9ca0f1bdc8160
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 23 00:01:38 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 23 00:01:39 2017 +0000
tree 000237f9b58f0eddfc5d3fd433501bf459c312d3
parent 38d71533eee7f13edba4fbca7cb79e4f96c915ae
parent 81b7b5f68ce27b146933e93dc601e9e6de27473a

Merge "Add manufacturer and model to device ID attestation"

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index f557ec1..7d1b348 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -150,6 +150,11 @@
                                                       included in attestation */
     KM_TAG_ATTESTATION_ID_MEID = KM_BYTES | 715,   /* Used to provide the device's MEID to be
                                                       included in attestation */
+    KM_TAG_ATTESTATION_ID_MANUFACTURER = KM_BYTES | 716, /* Used to provide the device's
+                                                            manufacturer name to be included in
+                                                            attestation */
+    KM_TAG_ATTESTATION_ID_MODEL = KM_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 */
     KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000, /* Used to provide associated data for AEAD modes. */