commit a3097ff9327ce7ac2cad3d5250d90170676c44b9
author Janis Danisevskis <jdanis@google.com> Wed Jan 04 16:50:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 04 16:50:03 2017 +0000
tree bf4edc9d5807a25d3980f0f20d6857cd4ffab15f
parent eafb8d9b3f7406b70c292902eca645dc00cea07a
parent 46239714428b19c4d8a42ef866bbef4440478f1d

Merge "fix is_secret_key_operation check" am: 7f35beb6cb am: 216b33f09c
am: 4623971442

Change-Id: I0f2320b758bcfe6bb2e5ab1dffab185100b89cc0

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;