diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-10 21:38:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 21:38:39 +0000 |
| commit | 5d6b0b41808e69c644cbc85d90a5842d5563e3dc (patch) | |
| tree | e08207d923a7a78b1c26fae71d049a5dbc61a168 | |
| parent | b9554eedc782391eb5304c03a0bf8f01b0280499 (diff) | |
| parent | e7444884c759b066c65e0be32a7e753c0c667709 (diff) | |
| download | hardware_libhardware-5d6b0b41808e69c644cbc85d90a5842d5563e3dc.zip hardware_libhardware-5d6b0b41808e69c644cbc85d90a5842d5563e3dc.tar.gz hardware_libhardware-5d6b0b41808e69c644cbc85d90a5842d5563e3dc.tar.bz2 | |
am e7444884: Merge "Make several key crypto parameters repeatable."
* commit 'e7444884c759b066c65e0be32a7e753c0c667709':
Make several key crypto parameters repeatable.
| -rw-r--r-- | include/hardware/keymaster_defs.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index 7c2d28d..81a62fe 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -55,13 +55,12 @@ typedef enum { KM_TAG_PURPOSE = KM_ENUM_REP | 1, /* keymaster_purpose_t. */ KM_TAG_ALGORITHM = KM_ENUM | 2, /* keymaster_algorithm_t. */ 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 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 + KM_TAG_BLOCK_MODE = KM_ENUM_REP | 4, /* keymaster_block_mode_t. */ + KM_TAG_DIGEST = KM_ENUM_REP | 5, /* keymaster_digest_t. */ + KM_TAG_PADDING = KM_ENUM_REP | 6, /* keymaster_padding_t. */ + KM_TAG_RETURN_UNAUTHED = KM_BOOL | 7, /* Allow AEAD decryption to return plaintext before it has been authenticated. WARNING: Not recommended. */ - KM_TAG_CALLER_NONCE = KM_BOOL | 9, /* Allow caller to specify nonce or IV. */ + KM_TAG_CALLER_NONCE = KM_BOOL | 8, /* Allow caller to specify nonce or IV. */ /* Other hardware-enforced. */ KM_TAG_RESCOPING_ADD = KM_ENUM_REP | 101, /* Tags authorized for addition via rescoping. */ @@ -130,6 +129,7 @@ typedef enum { KM_TAG_AUTH_TOKEN = KM_BYTES | 1003, /* 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. */ } keymaster_tag_t; /** |