diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2016-04-21 18:54:00 +0200 |
|---|---|---|
| committer | Dees Troy <dees_troy@teamw.in> | 2016-04-28 17:46:46 +0200 |
| commit | 9f1f2f744b6593f2d05bec571eb66485a21a47ba (patch) | |
| tree | 6751c62cf0efff94f1064ccebfe05475c7fc594a | |
| parent | Partition: Fix parsing of several twrp fstab flags (diff) | |
| download | android_bootable_recovery-9f1f2f744b6593f2d05bec571eb66485a21a47ba.tar android_bootable_recovery-9f1f2f744b6593f2d05bec571eb66485a21a47ba.tar.gz android_bootable_recovery-9f1f2f744b6593f2d05bec571eb66485a21a47ba.tar.bz2 android_bootable_recovery-9f1f2f744b6593f2d05bec571eb66485a21a47ba.tar.lz android_bootable_recovery-9f1f2f744b6593f2d05bec571eb66485a21a47ba.tar.xz android_bootable_recovery-9f1f2f744b6593f2d05bec571eb66485a21a47ba.tar.zst android_bootable_recovery-9f1f2f744b6593f2d05bec571eb66485a21a47ba.zip | |
| -rw-r--r-- | crypto/lollipop/cryptfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/lollipop/cryptfs.c b/crypto/lollipop/cryptfs.c index 56f10b92b..774eb1740 100644 --- a/crypto/lollipop/cryptfs.c +++ b/crypto/lollipop/cryptfs.c @@ -1208,8 +1208,8 @@ static int scrypt_keymaster(const char *passwd, const unsigned char *salt, unsigned char* master_key = convert_hex_ascii_to_key(passwd, &key_size); if (!master_key) { - printf("Failed to convert passwd from hex\n"); - return -1; + printf("Failed to convert passwd from hex, using passwd instead\n"); + master_key = strdup(passwd); } rc = crypto_scrypt(master_key, key_size, salt, SALT_LEN, |