From 253368a0726120efa57664cdd1d088af099a3d81 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Tue, 25 Nov 2014 15:00:52 -0600 Subject: Reduce libs needed for decrypt and clean up old decypt files Trim cryptfs.c to remove functions that TWRP does not use for decrypt and remove the need for libfs_mgr from cryptfs.c by passing some items to cryptfs.c from the partition manager. Add support for new fstab flags: encryptable and forceencrypt=/path/to/cryptokey For example: flags=forceencrypt=/dev/block/platform/sdhci-tegra.3/by-name/MD1 Note that "footer" is the default, so you do not need to set this flag on devices that use the footer for the crypto key. Also add mounttodecrypt if you need to mount a partition during the decrypt cycle for firmware of proprietary libs. Clean up decrypt and only support one version Android 5.0 lollipop decrypt should be backwards compatible with older versions so we will only support one version, 1.3 that came with 5.0 lollipop. Remove support for Samsung TouchWiz decrypt. It does not work with the latest versions of Samsung encryption anyway and it has not been updated to work with any AOSP decryption higher than 1.1 Change-Id: I2d9c6e31df50268c91ee642c2fa090f901d9d5c9 --- crypto/cryptsettings/Android.mk | 17 ----------- crypto/cryptsettings/cryptsettings.c | 55 ------------------------------------ 2 files changed, 72 deletions(-) delete mode 100644 crypto/cryptsettings/Android.mk delete mode 100644 crypto/cryptsettings/cryptsettings.c (limited to 'crypto/cryptsettings') diff --git a/crypto/cryptsettings/Android.mk b/crypto/cryptsettings/Android.mk deleted file mode 100644 index 3a5704891..000000000 --- a/crypto/cryptsettings/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) -ifeq ($(TW_INCLUDE_CRYPTO), true) -LOCAL_SRC_FILES:= \ - cryptsettings.c -LOCAL_CFLAGS:= -g -c -W -LOCAL_MODULE:=cryptsettings -LOCAL_MODULE_TAGS:= eng -LOCAL_SHARED_LIBRARIES += libc libcutils -ifeq ($(TW_INCLUDE_JB_CRYPTO), true) -LOCAL_CFLAGS += -DTW_INCLUDE_JB_CRYPTO -LOCAL_STATIC_LIBRARIES += libfs_mgrtwrp -endif -LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities -include $(BUILD_EXECUTABLE) -endif diff --git a/crypto/cryptsettings/cryptsettings.c b/crypto/cryptsettings/cryptsettings.c deleted file mode 100644 index 4fa2b9354..000000000 --- a/crypto/cryptsettings/cryptsettings.c +++ /dev/null @@ -1,55 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#ifdef TW_INCLUDE_JB_CRYPTO -#include "../crypto/fs_mgr/include/fs_mgr.h" -#endif - -#include "cutils/properties.h" - -#ifndef PROPERTY_VALUE_MAX -#define PROPERTY_VALUE_MAX 255 -#endif -#ifndef FSTAB_PREFIX -#define FSTAB_PREFIX "/fstab." -#endif - -int main(void) -{ - char prop[PROPERTY_VALUE_MAX]; - char key_loc[PROPERTY_VALUE_MAX]; - char blk_dev[PROPERTY_VALUE_MAX]; - char fstab_filename[PROPERTY_VALUE_MAX + sizeof(FSTAB_PREFIX)]; - - printf("This tool will gather the build flags needed for decryption support for TWRP.\n"); - printf("This tool comes with no warranties whatsoever.\n"); - printf("http://teamw.in\n\n"); - property_get("ro.crypto.state", prop, "encrypted"); - if (strcmp(prop, "encrypted") != 0) - printf("Your device is not encrypted, continuing anyway.\n\nTW_INCLUDE_CRYPTO := true\n"); - property_get("ro.crypto.fs_type", prop, "ERROR"); - printf("TW_CRYPTO_FS_TYPE := \"%s\"\n", prop); - property_get("ro.crypto.fs_real_blkdev", prop, "ERROR"); - printf("TW_CRYPTO_REAL_BLKDEV := \"%s\"\n", prop); - property_get("ro.crypto.fs_mnt_point", prop, "ERROR"); - printf("TW_CRYPTO_MNT_POINT := \"%s\"\n", prop); - property_get("ro.crypto.fs_options", prop, "ERROR"); - printf("TW_CRYPTO_FS_OPTIONS := \"%s\"\n", prop); - property_get("ro.crypto.fs_flags", prop, "ERROR"); - printf("TW_CRYPTO_FS_FLAGS := \"%s\"\n", prop); - property_get("ro.crypto.keyfile.userdata", prop, "footer"); - printf("TW_CRYPTO_KEY_LOC := \"%s\"\n", prop); -#ifdef TW_INCLUDE_JB_CRYPTO - printf("\n*** NEW FOR JELLY BEAN:\n"); - strcpy(fstab_filename, FSTAB_PREFIX); - property_get("ro.hardware", fstab_filename + sizeof(FSTAB_PREFIX) - 1, ""); - fs_mgr_get_crypt_info(fstab_filename, key_loc, blk_dev, sizeof(key_loc)); - printf("fstab file location: '%s'\n\nTW_INCLUDE_JB_CRYPTO := true\n", fstab_filename); -#endif - - return 0; -} -- cgit v1.2.3