diff --git a/Android.mk b/Android.mk index c556db3..84421e7 100644 --- a/Android.mk +++ b/Android.mk @@ -12,8 +12,7 @@ LOCAL_SRC_FILES := \ install.c \ roots.c \ ui.c \ - verifier.c \ - efs_migration.c + verifier.c LOCAL_SRC_FILES += test_roots.c diff --git a/efs_migration.c b/efs_migration.c deleted file mode 100644 index aeadd18..0000000 --- a/efs_migration.c +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#include - -#include "efs_migration.h" -#include "cutils/misc.h" -#include "cutils/properties.h" -#include "common.h" -#include "mtdutils/mtdutils.h" -#include "mtdutils/mounts.h" -#include "roots.h" - -const char* efs_enabled_property = "persist.security.efs.enabled"; -const char* efs_transition_property = "persist.security.efs.trans"; -const char* efs_property_dir = "/data/property/"; - -void get_property_file_name(char *buffer, const char *property_name) { - sprintf(buffer, "%s%s", efs_property_dir, property_name); -} - -int get_text_file_contents(char *buffer, int buf_size, char *file_name) { - FILE *in_file; - char *read_data; - - in_file = fopen(file_name, "r"); - if (in_file == NULL) { - LOGE("Encrypted FS: error accessing properties."); - return EFS_ERROR; - } - - read_data = fgets(buffer, buf_size, in_file); - if (read_data == NULL) { - // Error or unexpected data - fclose(in_file); - LOGE("Encrypted FS: error accessing properties."); - return EFS_ERROR; - } - - fclose(in_file); - return EFS_OK; -} - -int set_text_file_contents(char *buffer, char *file_name) { - FILE *out_file; - int result; - - out_file = fopen(file_name, "w"); - if (out_file == NULL) { - LOGE("Encrypted FS: error setting up properties."); - return EFS_ERROR; - } - - result = fputs(buffer, out_file); - if (result != 0) { - // Error or unexpected data - fclose(out_file); - LOGE("Encrypted FS: error setting up properties."); - return EFS_ERROR; - } - - fflush(out_file); - fclose(out_file); - return EFS_OK; -} - - -int read_efs_boolean_property(const char *prop_name, int *value) { - char prop_file_name[PROPERTY_KEY_MAX + 32]; - char prop_value[PROPERTY_VALUE_MAX]; - int result; - - get_property_file_name(prop_file_name, prop_name); - result = get_text_file_contents(prop_value, PROPERTY_VALUE_MAX, prop_file_name); - - if (result < 0) { - return result; - } - - if (strncmp(prop_value, "1", 1) == 0) { - *value = 1; - } else if (strncmp(prop_value, "0", 1) == 0) { - *value = 0; - } else { - LOGE("Encrypted FS: error accessing properties."); - return EFS_ERROR; - } - - return EFS_OK; -} - -int write_efs_boolean_property(const char *prop_name, int value) { - char prop_file_name[PROPERTY_KEY_MAX + 32]; - char prop_value[PROPERTY_VALUE_MAX]; - int result; - - get_property_file_name(prop_file_name, prop_name); - - // Create the directory if needed - mkdir(efs_property_dir, 0755); - if (value == 1) { - result = set_text_file_contents("1", prop_file_name); - } else if (value == 0) { - result = set_text_file_contents("0", prop_file_name); - } else { - return EFS_ERROR; - } - if (result < 0) { - return result; - } - - return EFS_OK; -} - -int read_encrypted_fs_info(encrypted_fs_info *efs_data) { - int result; - int value; - result = ensure_root_path_mounted("DATA:"); - if (result != 0) { - LOGE("Encrypted FS: error mounting userdata partition."); - return EFS_ERROR; - } - - // STOPSHIP: Read the EFS key from a file (TBD later) - // Future code goes here... - - result = ensure_root_path_unmounted("DATA:"); - if (result != 0) { - LOGE("Encrypted FS: error unmounting data partition."); - return EFS_ERROR; - } - - return EFS_OK; -} - -int restore_encrypted_fs_info(encrypted_fs_info *efs_data) { - int result; - result = ensure_root_path_mounted("DATA:"); - if (result != 0) { - LOGE("Encrypted FS: error mounting userdata partition."); - return EFS_ERROR; - } - - // Set the EFS properties to their respective values - result = write_efs_boolean_property(efs_enabled_property, efs_data->encrypted_fs_mode); - if (result != 0) { - return result; - } - - // Signal "transition" of Encrypted File System settings - result = write_efs_boolean_property(efs_transition_property, 1); - if (result != 0) { - return result; - } - - result = ensure_root_path_unmounted("DATA:"); - if (result != 0) { - LOGE("Encrypted FS: error unmounting data partition."); - return EFS_ERROR; - } - - return EFS_OK; -} - diff --git a/efs_migration.h b/efs_migration.h deleted file mode 100644 index 7857f94..0000000 --- a/efs_migration.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#ifndef __EFS_MIGRATION_H__ -#define __EFS_MIGRATION_H__ - -#define MODE_ENCRYPTEDFS_DISABLED 0 -#define MODE_ENCRYPTEDFS_ENABLED 1 - -#define EFS_OK 0 -#define EFS_ERROR (-1) - -struct encrypted_fs_info { - int encrypted_fs_mode; - char *encrypted_fs_key; -}; - -typedef struct encrypted_fs_info encrypted_fs_info; - -int read_encrypted_fs_info(encrypted_fs_info *efs_data); - -int restore_encrypted_fs_info(encrypted_fs_info *efs_data); - -#endif /* __EFS_MIGRATION_H__ */ - diff --git a/recovery.c b/recovery.c index 4c437e5..087258f 100644 --- a/recovery.c +++ b/recovery.c @@ -36,15 +36,12 @@ #include "minzip/DirUtil.h" #include "roots.h" #include "recovery_ui.h" -#include "efs_migration.h" static const struct option OPTIONS[] = { { "send_intent", required_argument, NULL, 's' }, { "update_package", required_argument, NULL, 'u' }, { "wipe_data", no_argument, NULL, 'w' }, { "wipe_cache", no_argument, NULL, 'c' }, - // TODO{oam}: implement improved command line passing key, egnor to review. - { "set_encrypted_filesystem", required_argument, NULL, 'e' }, { NULL, 0, NULL, 0 }, }; @@ -471,10 +468,7 @@ main(int argc, char **argv) { int previous_runs = 0; const char *send_intent = NULL; const char *update_package = NULL; - const char *efs_mode = NULL; int wipe_data = 0, wipe_cache = 0; - int toggle_efs = 0; - encrypted_fs_info efs_data; int arg; while ((arg = getopt_long(argc, argv, "", OPTIONS, NULL)) != -1) { @@ -484,7 +478,6 @@ main(int argc, char **argv) { case 'u': update_package = optarg; break; case 'w': wipe_data = wipe_cache = 1; break; case 'c': wipe_cache = 1; break; - case 'e': efs_mode = optarg; toggle_efs = 1; break; case '?': LOGE("Invalid command argument\n"); continue; @@ -504,42 +497,7 @@ main(int argc, char **argv) { int status = INSTALL_SUCCESS; - if (toggle_efs) { - if (strcmp(efs_mode,"on") == 0) { - efs_data.encrypted_fs_mode = MODE_ENCRYPTEDFS_ENABLED; - ui_print("Enabling Encrypted FS.\n"); - } else if (strcmp(efs_mode,"off") == 0) { - efs_data.encrypted_fs_mode = MODE_ENCRYPTEDFS_DISABLED; - ui_print("Disabling Encrypted FS.\n"); - } else { - ui_print("Error: invalid Encrypted FS setting.\n"); - status = INSTALL_ERROR; - } - - // Recovery strategy: if the data partition is damaged, disable encrypted file systems. - // This preventsthe device recycling endlessly in recovery mode. - // TODO{oam}: implement improved recovery strategy later. egnor to review. - if (read_encrypted_fs_info(&efs_data)) { - ui_print("Encrypted FS change aborted, resetting to disabled state.\n"); - efs_data.encrypted_fs_mode = MODE_ENCRYPTEDFS_DISABLED; - } - - if (status != INSTALL_ERROR) { - if (erase_root("DATA:")) { - ui_print("Data wipe failed.\n"); - status = INSTALL_ERROR; - } else if (erase_root("CACHE:")) { - ui_print("Cache wipe failed.\n"); - status = INSTALL_ERROR; - } else if (restore_encrypted_fs_info(&efs_data)) { - ui_print("Encrypted FS change aborted.\n"); - status = INSTALL_ERROR; - } else { - ui_print("Successfully updated Encrypted FS.\n"); - status = INSTALL_SUCCESS; - } - } - } else if (update_package != NULL) { + if (update_package != NULL) { status = install_package(update_package); if (status != INSTALL_SUCCESS) ui_print("Installation aborted.\n"); } else if (wipe_data) {