commit b751033ec92dfc57e5f922d7b55bea2f41ddb7e6
author Shawn Willden <swillden@google.com> Fri Feb 06 19:58:29 2015 -0700
committer Shawn Willden <swillden@google.com> Tue Feb 17 15:02:28 2015 -0700
tree 424f3d9e78e4eb0609ef8186fcf2f056325a562b
parent a550fba3d26d878873956f128de7607ff4cc96e4

Rename TAG_ADDITIONAL_DATA to TAG_ASSOCIATED_DATA.

Change-Id: Ibdbc0f0cd0a8daad6317f7ca0256ada9e6a05cd3

aes_key.cpp

diff --git a/aes_key.cpp b/aes_key.cpp
index ca5c294..5eff739 100644
--- a/aes_key.cpp
+++ b/aes_key.cpp
@@ -67,7 +67,7 @@
         return NULL;
 
     keymaster_blob_t additional_data = {0, 0};
-    authorizations().GetTagValue(TAG_ADDITIONAL_DATA, &additional_data);
+    authorizations().GetTagValue(TAG_ASSOCIATED_DATA, &additional_data);
 
     UniquePtr<Operation> op;
     switch (purpose) {

google_keymaster_test.cpp

diff --git a/google_keymaster_test.cpp b/google_keymaster_test.cpp
index 96efb40..2e60fbd 100644
--- a/google_keymaster_test.cpp
+++ b/google_keymaster_test.cpp
@@ -25,9 +25,9 @@
 
 #include <keymaster/google_keymaster_utils.h>
 #include <keymaster/keymaster_tags.h>
+#include <keymaster/soft_keymaster_device.h>
 
 #include "google_keymaster_test_utils.h"
-#include "soft_keymaster_device.h"
 
 using std::ifstream;
 using std::istreambuf_iterator;

include/keymaster/keymaster_tags.h

diff --git a/include/keymaster/keymaster_tags.h b/include/keymaster/keymaster_tags.h
index 1ca1dac..761bd95 100644
--- a/include/keymaster/keymaster_tags.h
+++ b/include/keymaster/keymaster_tags.h
@@ -176,7 +176,7 @@
 DEFINE_KEYMASTER_TAG(KM_DATE, TAG_CREATION_DATETIME);
 DEFINE_KEYMASTER_TAG(KM_BOOL, TAG_ROLLBACK_RESISTANT);
 DEFINE_KEYMASTER_TAG(KM_BYTES, TAG_ROOT_OF_TRUST);
-DEFINE_KEYMASTER_TAG(KM_BYTES, TAG_ADDITIONAL_DATA);
+DEFINE_KEYMASTER_TAG(KM_BYTES, TAG_ASSOCIATED_DATA);
 
 #ifdef KEYMASTER_NAME_TAGS
 #define DEFINE_KEYMASTER_ENUM_TAG(type, name, enumtype)                                            \