summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2015-09-11 13:21:16 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-09-11 13:21:16 +0000
commitd527792f1fe9554add1fe7b1b17eb62ae9de4a43 (patch)
treebeb811a255ea40e8a11c795aca3058ef0e15ddf7
parentfef6638e82a8b3140f45e7ce410ad72609821142 (diff)
parent4ff5f8fe34d0a64365e756533917889f3e35be9f (diff)
downloadlibhardware-d527792f1fe9554add1fe7b1b17eb62ae9de4a43.tar.gz
Merge "Add KM_TAG_MIN_MAC_LENGTH."
-rw-r--r--include/hardware/keymaster_defs.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 32374f1d..b19086ee 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -59,6 +59,8 @@ typedef enum {
KM_TAG_DIGEST = KM_ENUM_REP | 5, /* keymaster_digest_t. */
KM_TAG_PADDING = KM_ENUM_REP | 6, /* keymaster_padding_t. */
KM_TAG_CALLER_NONCE = KM_BOOL | 7, /* Allow caller to specify nonce or IV. */
+ KM_TAG_MIN_MAC_LENGTH = KM_UINT | 8, /* Minimum length of MAC or AEAD authentication tag in
+ * bits. */
/* Algorithm-specific. */
KM_TAG_RSA_PUBLIC_EXPONENT = KM_ULONG | 200,
@@ -336,6 +338,9 @@ typedef enum {
KM_ERROR_KEY_RATE_LIMIT_EXCEEDED = -54,
KM_ERROR_CALLER_NONCE_PROHIBITED = -55,
KM_ERROR_KEY_MAX_OPS_EXCEEDED = -56,
+ KM_ERROR_INVALID_MAC_LENGTH = -57,
+ KM_ERROR_MISSING_MIN_MAC_LENGTH = -58,
+ KM_ERROR_UNSUPPORTED_MIN_MAC_LENGTH = -59,
KM_ERROR_UNIMPLEMENTED = -100,
KM_ERROR_VERSION_MISMATCH = -101,