diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-07-22 15:24:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-22 15:24:28 +0000 |
| commit | f9df59a7ff292b536a557280cb8b2fc93eedabd0 (patch) | |
| tree | cefa39a5172a4cc730c2d1498c20f643b777ef5e | |
| parent | d95a340b9f74b38703e78b3e2e8bc43f49c3ebf8 (diff) | |
| parent | a3f0ab55a73d4c21de9f34ec21f27a2609b568fd (diff) | |
| download | hardware_libhardware-f9df59a7ff292b536a557280cb8b2fc93eedabd0.zip hardware_libhardware-f9df59a7ff292b536a557280cb8b2fc93eedabd0.tar.gz hardware_libhardware-f9df59a7ff292b536a557280cb8b2fc93eedabd0.tar.bz2 | |
Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
| -rw-r--r-- | include/hardware/keymaster_defs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index 32374f1..b19086e 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, |