openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "[gatekeeperd] copy uid to local before passing to u_map" am: fe8213f0dd 

am: a9a2eaeadc

* commit 'a9a2eaeadc3485e4b2e89f6fd43e02050bfdc687':
  [gatekeeperd] copy uid to local before passing to u_map
This commit is contained in:
Dan Albert 2015-11-05 19:53:53 +00:00 committed by android-build-merger
parent 5531cc3395 a9a2eaeadc
commit a619440436
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gatekeeperd/SoftGateKeeper.h
View File

@ -25,8 +25,10 @@ extern "C" {
#include <crypto_scrypt.h>
}
#include <base/memory.h>
#include <UniquePtr.h>
#include <gatekeeper/gatekeeper.h>
#include <iostream>
#include <unordered_map>
@ -150,14 +152,15 @@ public:
}
bool DoVerify(const password_handle_t *expected_handle, const SizedBuffer &password) {
FastHashMap::const_iterator it = fast_hash_map_.find(expected_handle->user_id);
uint64_t user_id = android::base::get_unaligned(&expected_handle->user_id);
FastHashMap::const_iterator it = fast_hash_map_.find(user_id);
if (it != fast_hash_map_.end() && VerifyFast(it->second, password)) {
return true;
} else {
if (GateKeeper::DoVerify(expected_handle, password)) {
uint64_t salt;
GetRandom(&salt, sizeof(salt));
fast_hash_map_[expected_handle->user_id] = ComputeFastHash(password, salt);
fast_hash_map_[user_id] = ComputeFastHash(password, salt);
return true;
}
}

2
gatekeeperd/tests/Android.mk
View File

@ -20,7 +20,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := gatekeeperd-unit-tests
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers
LOCAL_SHARED_LIBRARIES := libgatekeeper libcrypto
LOCAL_SHARED_LIBRARIES := libgatekeeper libcrypto libbase
LOCAL_STATIC_LIBRARIES := libscrypt_static
LOCAL_C_INCLUDES := external/scrypt/lib/crypto
LOCAL_SRC_FILES := \