summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Morales <anmorales@google.com>2015-06-02 17:44:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-02 17:44:17 +0000
commitc6d5cd18f86aa78b769ba06e43963231f05bc809 (patch)
tree1d2e8603fb2b745c6a9d5565fda8c3aacd10f295
parent23d84074652b77385431fc0d1505b7d43b7dba9e (diff)
parent531e3e83c28a2fdb2270b26b2bf0333ed6e30682 (diff)
downloadsystem_core-c6d5cd18f86aa78b769ba06e43963231f05bc809.zip
system_core-c6d5cd18f86aa78b769ba06e43963231f05bc809.tar.gz
system_core-c6d5cd18f86aa78b769ba06e43963231f05bc809.tar.bz2
Merge "[gatekeeperd] verify a password after enrolling successfully" into mnc-dev
-rw-r--r--gatekeeperd/gatekeeperd.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index ad16fa5..c0f2279 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -136,6 +136,12 @@ public:
gatekeeper::password_handle_t *handle =
reinterpret_cast<gatekeeper::password_handle_t *>(*enrolled_password_handle);
store_sid(uid, handle->user_id);
+ bool rr;
+
+ // immediately verify this password so we don't ask the user to enter it again
+ // if they just created it.
+ verify(uid, *enrolled_password_handle, sizeof(password_handle_t), desired_password,
+ desired_password_length, &rr);
}
return ret;