tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: a3097ff932

Change-Id: If93e31e54333abbe1d8f8844f87c177ce2845473
This commit is contained in:
Janis Danisevskis 2017-01-04 16:52:33 +00:00 committed by android-build-merger
commit 668cd308b7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keystore/auth_token_table.cpp
View file

@ -61,7 +61,7 @@ void AuthTokenTable::AddAuthenticationToken(const hw_auth_token_t* auth_token) {
}
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;