commit 29e2f1c659f46b1924d304ebce32a32eb4aa1b1b
author Darren Krahn <dkrahn@google.com> Fri Mar 04 22:14:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 04 22:14:57 2016 +0000
tree e27887e91f3a9f3619512f89a9f2776ee809d92f
parent 45ca6e53afe2e8a59f43968b8a7d9cda102a81d8
parent 6148b2043bb4dd2ddb8c98289fe6b9a482395e31

Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE."
am: 6148b2043b

* commit '6148b2043bb4dd2ddb8c98289fe6b9a482395e31':
  keystore_cli_v2: Removed test for KM_TAG_PURPOSE.

keystore/keystore_cli_v2.cpp

diff --git a/keystore/keystore_cli_v2.cpp b/keystore/keystore_cli_v2.cpp
index 60c9add..9b966d5 100644
--- a/keystore/keystore_cli_v2.cpp
+++ b/keystore/keystore_cli_v2.cpp
@@ -99,8 +99,7 @@
     printf("%s Key Characteristics:\n", name.c_str());
     PrintKeyCharacteristics(hardware_enforced_characteristics, software_enforced_characteristics);
     bool hardware_backed = (hardware_enforced_characteristics.size() > 0);
-    if (software_enforced_characteristics.GetTagCount(KM_TAG_PURPOSE) > 0 ||
-        software_enforced_characteristics.GetTagCount(KM_TAG_ALGORITHM) > 0 ||
+    if (software_enforced_characteristics.GetTagCount(KM_TAG_ALGORITHM) > 0 ||
         software_enforced_characteristics.GetTagCount(KM_TAG_KEY_SIZE) > 0 ||
         software_enforced_characteristics.GetTagCount(KM_TAG_RSA_PUBLIC_EXPONENT) > 0) {
         VLOG(1) << "Hardware-backed key but required characteristics enforced in software.";