summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2015-06-18 12:09:20 -0600
committerShawn Willden <swillden@google.com>2015-06-18 12:19:03 -0600
commitda89dde9787dfbd8c053119ab52d9e671106b18e (patch)
tree1b2a739701e2b3114159e29cb7f2b027b8a5e78a
parent8e350b1a1d148ebf85e2c246e9f491fcdee51bdf (diff)
downloadhardware_libhardware-da89dde9787dfbd8c053119ab52d9e671106b18e.zip
hardware_libhardware-da89dde9787dfbd8c053119ab52d9e671106b18e.tar.gz
hardware_libhardware-da89dde9787dfbd8c053119ab52d9e671106b18e.tar.bz2
Remove KM_TAG_AEAD_TAG.
Bug: 19919114 Change-Id: I06fdd0f9b8e247587d800031d3367078423baa50
-rw-r--r--include/hardware/keymaster_defs.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 77067d5..335e955 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -121,13 +121,10 @@ typedef enum {
/* 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 */
- KM_TAG_AEAD_TAG = KM_BYTES | 1002, /* AEAD tag data. Returned from finish() during AEAD
- * encryption and provided to begin() during AEAD
- * decryption.*/
- KM_TAG_AUTH_TOKEN = KM_BYTES | 1003, /* Authentication token that proves secure user
+ KM_TAG_AUTH_TOKEN = KM_BYTES | 1002, /* Authentication token that proves secure user
authentication has been performed. Structure
defined in hw_auth_token_t in hw_auth_token.h. */
- KM_TAG_MAC_LENGTH = KM_INT | 1004, /* MAC or AEAD authentication tag length in bits. */
+ KM_TAG_MAC_LENGTH = KM_INT | 1003, /* MAC or AEAD authentication tag length in bits. */
} keymaster_tag_t;
/**