summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2019-04-23 12:02:26 +0200
committercodeworkx <daniel.hillenbrand@codeworkx.de>2019-04-23 12:07:43 +0200
commit22e3aa9ed68c646050888d108257ff7fa6216910 (patch)
treed3e01fd16bc606771ab93e1e2e54759e11df5c65 /crypto
parentMerge "languages: encode for utf-8 in the appropriate places." into android-9.0 (diff)
downloadandroid_bootable_recovery-22e3aa9ed68c646050888d108257ff7fa6216910.tar
android_bootable_recovery-22e3aa9ed68c646050888d108257ff7fa6216910.tar.gz
android_bootable_recovery-22e3aa9ed68c646050888d108257ff7fa6216910.tar.bz2
android_bootable_recovery-22e3aa9ed68c646050888d108257ff7fa6216910.tar.lz
android_bootable_recovery-22e3aa9ed68c646050888d108257ff7fa6216910.tar.xz
android_bootable_recovery-22e3aa9ed68c646050888d108257ff7fa6216910.tar.zst
android_bootable_recovery-22e3aa9ed68c646050888d108257ff7fa6216910.zip
Diffstat (limited to 'crypto')
-rw-r--r--crypto/ext4crypt/Decrypt.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/ext4crypt/Decrypt.cpp b/crypto/ext4crypt/Decrypt.cpp
index 3eeaaf877..e69b64793 100644
--- a/crypto/ext4crypt/Decrypt.cpp
+++ b/crypto/ext4crypt/Decrypt.cpp
@@ -1336,7 +1336,11 @@ bool Decrypt_User(const userid_t user_id, const std::string& Password) {
printf("e4crypt_unlock_user_key returned fail\n");
return false;
}
- if (!e4crypt_prepare_user_storage(nullptr, user_id, 0, flags)) {
+#ifdef USE_KEYSTORAGE_4
+ if (!e4crypt_prepare_user_storage("", user_id, 0, flags)) {
+#else
+ if (!e4crypt_prepare_user_storage(nullptr, user_id, 0, flags)) {
+#endif
printf("failed to e4crypt_prepare_user_storage\n");
return false;
}