commit 67ba9e8144ba65ef6fe55bf8211530f2a55b320c
author Shawn Willden <swillden@google.com> Fri Feb 06 17:04:53 2015 -0700
committer Shawn Willden <swillden@google.com> Mon Feb 09 16:02:51 2015 -0700
tree ca2cee765c1ebc6a5b7f9b03f557b8abdaf6bbe9
parent 949d6d4bfc1cf37a84d5d4ac00a20017941fdeba

Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA

Change-Id: Ieddd706ee205100719f7e2f9e18b3d9b07c37669

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 4649055..4f9de17 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -173,8 +173,8 @@
     KM_TAG_ROOT_OF_TRUST = KM_BYTES | 704,     /* Root of trust ID.  Empty array means usable by all
                                                   roots. */
 
-    /* Tags used only to provide data to operations */
-    KM_TAG_ADDITIONAL_DATA = KM_BYTES | 1000, /* Used to provide additional data for AEAD modes. */
+    /* 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. */
     KM_TAG_NONCE = KM_BYTES | 1001,           /* Nonce or Initialization Vector */
 } keymaster_tag_t;