diff options
| author | Shawn Willden <swillden@google.com> | 2015-11-23 16:33:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-23 16:33:54 +0000 |
| commit | 5a02a610665a5ef7a14655651aac1da80da7e5dd (patch) | |
| tree | 09226d46b8f1e19aaf507786048cbc0f5bf26c35 | |
| parent | bd6db0b4ab6b1175e5542cd0d93811ce56931cb5 (diff) | |
| parent | e5f3a444f692f2d61d54783021551bb82c56e507 (diff) | |
| download | security-5a02a610665a5ef7a14655651aac1da80da7e5dd.tar.gz | |
Merge "ECIES: adding ECIES-KEM" am: ab42146068
am: e5f3a444f6
* commit 'e5f3a444f692f2d61d54783021551bb82c56e507':
ECIES: adding ECIES-KEM
| -rw-r--r-- | keystore/keystore_cli_v2.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/keystore/keystore_cli_v2.cpp b/keystore/keystore_cli_v2.cpp index 3f5feb77..526dc57b 100644 --- a/keystore/keystore_cli_v2.cpp +++ b/keystore/keystore_cli_v2.cpp @@ -126,6 +126,12 @@ const char* StringifyTag(keymaster_tag_t tag) { return "KM_TAG_AUTH_TOKEN"; case KM_TAG_MAC_LENGTH: return "KM_TAG_MAC_LENGTH"; + case KM_TAG_KDF: + return "KM_TAG_KDF"; + case KM_TAG_EC_CURVE: + return "KM_TAG_EC_CURVE"; + case KM_TAG_ECIES_SINGLE_HASH_MODE: + return "KM_TAG_ECIES_SINGLE_HASH_MODE"; } return "<Unknown>"; } |