diff options
| author | Shawn Willden <swillden@google.com> | 2015-06-08 23:10:44 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-06-17 09:07:03 -0600 |
| commit | 34419130408d2a6dcadd7b0f1b6d2c9c4002bbac (patch) | |
| tree | c2f5b2d4e99c12076597213f55bee02a50aee055 /include | |
| parent | 124ae8f141689c48ed0b77709d3db2017cb1b75f (diff) | |
| download | keymaster-34419130408d2a6dcadd7b0f1b6d2c9c4002bbac.tar.gz | |
GCM tags in ciphertext, rather than in params.
Also, handle AAD correctly.
Bug: 21786749
Change-Id: I26a413f39daf3bd946ed494c7c3b5c6f559fb30b
Diffstat (limited to 'include')
| -rw-r--r-- | include/keymaster/keymaster_tags.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/keymaster/keymaster_tags.h b/include/keymaster/keymaster_tags.h index 3213a2e..954a93d 100644 --- a/include/keymaster/keymaster_tags.h +++ b/include/keymaster/keymaster_tags.h @@ -161,7 +161,6 @@ class TypedEnumTag { DEFINE_KEYMASTER_TAG(KM_INVALID, TAG_INVALID); DEFINE_KEYMASTER_TAG(KM_INT, TAG_KEY_SIZE); DEFINE_KEYMASTER_TAG(KM_INT, TAG_MAC_LENGTH); -DEFINE_KEYMASTER_TAG(KM_BYTES, TAG_AEAD_TAG); DEFINE_KEYMASTER_TAG(KM_BOOL, TAG_CALLER_NONCE); DEFINE_KEYMASTER_TAG(KM_LONG, TAG_RSA_PUBLIC_EXPONENT); DEFINE_KEYMASTER_TAG(KM_DATE, TAG_ACTIVE_DATETIME); |