commit 82f353182571d9e1f1036ccde0000178dd143735
author Shawn Willden <swillden@google.com> Mon Nov 23 16:36:51 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 23 16:36:51 2015 +0000
tree 48a7e62cded7a05d2009d4e696c9794925abf75e
parent 9fa8f625012a88ff5b56f1e42f1e3fe79562fb7d
parent 347c9b233e0f0f03ad3b48d5b512a990934914dc

Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6
am: 347c9b233e

* commit '347c9b233e0f0f03ad3b48d5b512a990934914dc':
  ECIES: adding ECIES-KEM

keystore/keystore_cli_v2.cpp

diff --git a/keystore/keystore_cli_v2.cpp b/keystore/keystore_cli_v2.cpp
index 3f5feb7..526dc57 100644
--- a/keystore/keystore_cli_v2.cpp
+++ b/keystore/keystore_cli_v2.cpp
@@ -126,6 +126,12 @@
         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>";
 }