diff options
author | Shawn Willden <swillden@google.com> | 2016-01-25 17:40:14 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-01-25 17:40:14 +0000 |
commit | c3034a6d9cdb4c231e205d343f667444bbe519cd (patch) | |
tree | da484267ab96b7b0bd3dfc05676dad44783f0ef4 | |
parent | fc7725947870227df7e4459a05d33f2eb159b2f5 (diff) | |
parent | 9eedb2e60307856dafc53ed4331708ce70c89df3 (diff) | |
download | security-c3034a6d9cdb4c231e205d343f667444bbe519cd.tar.gz |
Merge "Update keystore_cli_v2 for keymaster_defs changes." am: 93c57ca1b2
am: 9eedb2e603
* commit '9eedb2e60307856dafc53ed4331708ce70c89df3':
Update keystore_cli_v2 for keymaster_defs changes.
-rw-r--r-- | keystore/keystore_cli_v2.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/keystore/keystore_cli_v2.cpp b/keystore/keystore_cli_v2.cpp index 526dc57b..3efc99af 100644 --- a/keystore/keystore_cli_v2.cpp +++ b/keystore/keystore_cli_v2.cpp @@ -132,6 +132,18 @@ const char* StringifyTag(keymaster_tag_t tag) { return "KM_TAG_EC_CURVE"; case KM_TAG_ECIES_SINGLE_HASH_MODE: return "KM_TAG_ECIES_SINGLE_HASH_MODE"; + case KM_TAG_OS_VERSION: + return "KM_TAG_OS_VERSION"; + case KM_TAG_OS_PATCHLEVEL: + return "KM_TAG_OS_PATCHLEVEL"; + case KM_TAG_EXPORTABLE: + return "KM_TAG_EXPORTABLE"; + case KM_TAG_UNIQUE_ID: + return "KM_TAG_UNIQUE_ID"; + case KM_TAG_INCLUDE_UNIQUE_ID: + return "KM_TAG_INCLUDE_UNIQUE_ID"; + case KM_TAG_RESET_SINCE_ID_ROTATION: + return "KM_TAG_RESET_SINCE_ID_ROTATION"; } return "<Unknown>"; } |