OSDN Git Service
(root)
/
android-x86
/
system-vold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
81f55c6
)
Don't break on setting default password
author
Paul Lawrence
<paullawrence@google.com>
Tue, 7 Jul 2015 22:43:14 +0000
(15:43 -0700)
committer
Paul Lawrence
<paullawrence@google.com>
Mon, 13 Jul 2015 16:59:12 +0000
(16:59 +0000)
Bug:
22329642
Change-Id: I58dac4dba8e65c7015d50ca0c3575f77f550a215
cryptfs.c
patch
|
blob
|
history
diff --git
a/cryptfs.c
b/cryptfs.c
index
a905ff6
..
1a63a5b
100644
(file)
--- a/
cryptfs.c
+++ b/
cryptfs.c
@@
-3237,7
+3237,9
@@
int cryptfs_enable_default(char *howarg, int allow_reboot)
int cryptfs_changepw(int crypt_type, const char *newpw)
{
if (e4crypt_crypto_complete(DATA_MNT_POINT) == 0) {
- return e4crypt_change_password(DATA_MNT_POINT, crypt_type, newpw);
+ return e4crypt_change_password(DATA_MNT_POINT, crypt_type,
+ crypt_type == CRYPT_TYPE_DEFAULT ? DEFAULT_PASSWORD
+ : newpw);
}
struct crypt_mnt_ftr crypt_ftr;