commit 8840a6833a4be28dddef0a3a318f0145b3f615cd
author Alex Klyubin <klyubin@google.com> Tue Feb 24 00:56:30 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 24 00:56:30 2015 +0000
tree 2c5b3c06d36cdf39e53a0f85ce0a3aeaa6b7698a
parent 3cbe71422d9df74a2a1383f858fa81ea9b267cb7
parent 587d8313d6d9d9f44ac2d8702676c02c792e1bf3

am 587d8313: am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."

* commit '587d8313d6d9d9f44ac2d8702676c02c792e1bf3':
  Clarify the meaning of KM_TAG_MAC_LENGTH.

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 9c6ad9d..f8e90b6 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -107,7 +107,7 @@
     KM_TAG_KEY_SIZE = KM_INT | 3,         /* Key size in bits. */
     KM_TAG_BLOCK_MODE = KM_ENUM | 4,      /* keymaster_block_mode_t. */
     KM_TAG_DIGEST = KM_ENUM | 5,          /* keymaster_digest_t. */
-    KM_TAG_MAC_LENGTH = KM_INT | 6,       /* MAC length in bits. */
+    KM_TAG_MAC_LENGTH = KM_INT | 6,       /* MAC or AEAD authentication tag length in bits. */
     KM_TAG_PADDING = KM_ENUM | 7,         /* keymaster_padding_t. */
     KM_TAG_RETURN_UNAUTHED = KM_BOOL | 8, /* Allow AEAD decryption to return plaintext before it has
                                              been authenticated.  WARNING: Not recommended. */