commit 7f35beb6cb1a554e8a9c86ade9b4206deda3d9c2
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 04 16:42:22 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 04 16:42:23 2017 +0000
tree bf4edc9d5807a25d3980f0f20d6857cd4ffab15f
parent ac28b5848848b2b634e958d745d87502bd4f8315
parent c13071510ee3c8ed091d09c9c99e2f2e7b6d00d8

Merge "fix is_secret_key_operation check"

keystore/auth_token_table.cpp

diff --git a/keystore/auth_token_table.cpp b/keystore/auth_token_table.cpp
index 76e757b..f0f4981 100644
--- a/keystore/auth_token_table.cpp
+++ b/keystore/auth_token_table.cpp
@@ -61,7 +61,7 @@
 }
 
 inline bool is_secret_key_operation(keymaster_algorithm_t algorithm, keymaster_purpose_t purpose) {
-    if ((algorithm != KM_ALGORITHM_RSA || algorithm != KM_ALGORITHM_EC))
+    if ((algorithm != KM_ALGORITHM_RSA && algorithm != KM_ALGORITHM_EC))
         return true;
     if (purpose == KM_PURPOSE_SIGN || purpose == KM_PURPOSE_DECRYPT)
         return true;