am 343d7082: am b2856ddb: Merge "[gatekeeperd] invalidate stale password cache" into mnc-dev

* commit '343d708234636d505653d4ed1c9104463db76bab':
  [gatekeeperd] invalidate stale password cache
This commit is contained in:
Andres Morales 2015-06-23 22:21:15 +00:00 committed by Android Git Automerger
commit 991680bf60
1 changed files with 2 additions and 2 deletions

View File

@ -151,8 +151,8 @@ public:
bool DoVerify(const password_handle_t *expected_handle, const SizedBuffer &password) {
FastHashMap::const_iterator it = fast_hash_map_.find(expected_handle->user_id);
if (it != fast_hash_map_.end()) {
return VerifyFast(it->second, password);
if (it != fast_hash_map_.end() && VerifyFast(it->second, password)) {
return true;
} else {
if (GateKeeper::DoVerify(expected_handle, password)) {
uint64_t salt;