summaryrefslogtreecommitdiffstats
path: root/crypto/jb/cryptfs.c
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2014-02-26 21:00:54 +0100
committerGerrit Code Review <gerrit2@gerrit>2014-02-26 21:00:54 +0100
commit5e73cc7703ef8ed8f08cc6e8704349e1ec374334 (patch)
tree7fe3c75a2fada291c9b5004a08ec54483dbddc9c /crypto/jb/cryptfs.c
parentMerge "Check auto generated backup names for invalid characters" into android-4.4 (diff)
parentCheck crypto footer before offering to decrypt (diff)
downloadandroid_bootable_recovery-5e73cc7703ef8ed8f08cc6e8704349e1ec374334.tar
android_bootable_recovery-5e73cc7703ef8ed8f08cc6e8704349e1ec374334.tar.gz
android_bootable_recovery-5e73cc7703ef8ed8f08cc6e8704349e1ec374334.tar.bz2
android_bootable_recovery-5e73cc7703ef8ed8f08cc6e8704349e1ec374334.tar.lz
android_bootable_recovery-5e73cc7703ef8ed8f08cc6e8704349e1ec374334.tar.xz
android_bootable_recovery-5e73cc7703ef8ed8f08cc6e8704349e1ec374334.tar.zst
android_bootable_recovery-5e73cc7703ef8ed8f08cc6e8704349e1ec374334.zip
Diffstat (limited to 'crypto/jb/cryptfs.c')
-rw-r--r--crypto/jb/cryptfs.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/crypto/jb/cryptfs.c b/crypto/jb/cryptfs.c
index 4e5706b64..f9c0d7489 100644
--- a/crypto/jb/cryptfs.c
+++ b/crypto/jb/cryptfs.c
@@ -1354,13 +1354,32 @@ int cryptfs_crypto_complete(void)
#define FSTAB_PREFIX "/fstab."
+int cryptfs_check_footer(void)
+{
+ int rc = -1;
+ char fstab_filename[PROPERTY_VALUE_MAX + sizeof(FSTAB_PREFIX)];
+ char propbuf[PROPERTY_VALUE_MAX];
+ struct crypt_mnt_ftr crypt_ftr;
+
+ property_get("ro.hardware", propbuf, "");
+ snprintf(fstab_filename, sizeof(fstab_filename), FSTAB_PREFIX"%s", propbuf);
+
+ fstab = fs_mgr_read_fstab(fstab_filename);
+ if (!fstab) {
+ printf("failed to open %s\n", fstab_filename);
+ return -1;
+ }
+
+ rc = get_crypt_ftr_and_key(&crypt_ftr);
+
+ return rc;
+}
+
int cryptfs_check_passwd(char *passwd)
{
int rc = -1;
char fstab_filename[PROPERTY_VALUE_MAX + sizeof(FSTAB_PREFIX)];
char propbuf[PROPERTY_VALUE_MAX];
- int i;
- int flags;
property_get("ro.hardware", propbuf, "");
snprintf(fstab_filename, sizeof(fstab_filename), FSTAB_PREFIX"%s", propbuf);