diff options
author | Paul Lawrence <paullawrence@google.com> | 2015-02-06 16:56:13 +0000 |
---|---|---|
committer | Paul Lawrence <paullawrence@google.com> | 2015-02-06 17:32:56 +0000 |
commit | 223fd1cad8d627dc36e11da8cdd342c1a810d226 (patch) | |
tree | 3c5ac2a9af38f6ebdbb82aa810bdf34d79a561cf /cryptfs.c | |
parent | 6a69cfc411c086f15d59b7dc105763af16620414 (diff) | |
download | android_system_vold-223fd1cad8d627dc36e11da8cdd342c1a810d226.tar.gz android_system_vold-223fd1cad8d627dc36e11da8cdd342c1a810d226.tar.bz2 android_system_vold-223fd1cad8d627dc36e11da8cdd342c1a810d226.zip |
Revert "Make encryption configurable"
This reverts commit 6a69cfc411c086f15d59b7dc105763af16620414.
The original fix seems to have led to boot failures in QA. Rather than
risk shipping, revert the change. Bug 18764230 reopened.
Requires change
https://googleplex-android-review.git.corp.google.com/#/c/629950/
Bug: 19278390
Bug: 19199624
Change-Id: Ia858c4db0abb917f9364ec8048f59ca4fb48e233
Diffstat (limited to 'cryptfs.c')
-rw-r--r-- | cryptfs.c | 43 |
1 files changed, 0 insertions, 43 deletions
@@ -3310,49 +3310,6 @@ int cryptfs_enable_default(char *howarg, int allow_reboot) DEFAULT_PASSWORD, allow_reboot); } -static int device_is_force_encrypted() { - int ret = -1; - char value[PROP_VALUE_MAX]; - ret = __system_property_get("ro.vold.forceencryption", value); - if (ret < 0) - return 0; - return strcmp(value, "1") ? 0 : 1; -} - -int cryptfs_maybe_enable_default_crypto() -{ - // Enable default crypt if /forceencrypt or /encryptable and - // ro.vold.forceencrypt=1, else mount data and continue unencrypted - struct fstab_rec *fstab_rec = 0; - fstab_rec = fs_mgr_get_entry_for_mount_point(fstab, DATA_MNT_POINT); - if (!fstab_rec) { - SLOGE("Error getting fstab record"); - return -1; - } - - // See if we should encrypt? - if ( !fs_mgr_is_encryptable(fstab_rec) - || (!fs_mgr_is_force_encrypted(fstab_rec) - && !device_is_force_encrypted())) { - int rc = 0; - - rc = fs_mgr_do_mount(fstab, DATA_MNT_POINT, fstab_rec->blk_device, 0); - property_set("vold.decrypt", "trigger_load_persist_props"); - - /* Create necessary paths on /data */ - if (prep_data_fs()) { - return -1; - } - - property_set("ro.crypto.state", "unencrypted"); - property_set("vold.decrypt", "trigger_restart_framework"); - SLOGD("Unencrypted - restart_framework\n"); - return rc; - } - - return cryptfs_enable_default("inplace", 0); -} - int cryptfs_changepw(int crypt_type, const char *newpw) { struct crypt_mnt_ftr crypt_ftr; |