tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fall back to dm-crypt if device already encrypted

Browse source 
Devices already encrypted with aes-cbc-essiv:sha256 will continue to be
decrypted in software, until a factory data reset.  New devices that
implement CONFIG_HW_DISK_ENCRYPTION will switch to aes-xts.

b/17475056 Enable hardware crypto for userdata encryption

Change-Id: I62d1583bdaf7ff06b87e386e758fa3b18c719bca
Signed-off-by: Iliyan Malchev <malchev@google.com>
This commit is contained in:
Iliyan Malchev 2014-11-20 18:42:23 -08:00
parent 87701e2755
commit bb7d9afea9
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
cryptfs.c
View file

@ -997,7 +997,12 @@ static int load_crypto_mapping_table(struct crypt_mnt_ftr *crypt_ftr, unsigned c
tgt->sector_start = 0; tgt->sector_start = 0;
tgt->length = crypt_ftr->fs_size; tgt->length = crypt_ftr->fs_size;
#ifdef CONFIG_HW_DISK_ENCRYPTION #ifdef CONFIG_HW_DISK_ENCRYPTION
strlcpy(tgt->target_type, "req-crypt", DM_MAX_TYPE_NAME); if (!strcmp((char *)crypt_ftr->crypto_type_name, "aes-xts")) {
strlcpy(tgt->target_type, "req-crypt", DM_MAX_TYPE_NAME);
}
else {
strlcpy(tgt->target_type, "crypt", DM_MAX_TYPE_NAME);
}
#else #else
strlcpy(tgt->target_type, "crypt", DM_MAX_TYPE_NAME); strlcpy(tgt->target_type, "crypt", DM_MAX_TYPE_NAME);
#endif #endif
@ -1047,7 +1052,7 @@ static int get_dm_crypt_version(int fd, const char *name, int *version)
v = (struct dm_target_versions *) &buffer[sizeof(struct dm_ioctl)]; v = (struct dm_target_versions *) &buffer[sizeof(struct dm_ioctl)];
while (v->next) { while (v->next) {
#ifdef CONFIG_HW_DISK_ENCRYPTION #ifdef CONFIG_HW_DISK_ENCRYPTION
if(!strcmp(v->name, "crypt") || !strcmp(v->name, "req-crypt")) { if (! strcmp(v->name, "crypt") || ! strcmp(v->name, "req-crypt")) {
#else #else
if (! strcmp(v->name, "crypt")) { if (! strcmp(v->name, "crypt")) {
#endif #endif
@ -1764,8 +1769,10 @@ static int test_mount_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr,
fs_mgr_get_crypt_info(fstab, 0, real_blkdev, sizeof(real_blkdev)); fs_mgr_get_crypt_info(fstab, 0, real_blkdev, sizeof(real_blkdev));
#ifdef CONFIG_HW_DISK_ENCRYPTION #ifdef CONFIG_HW_DISK_ENCRYPTION
if(!set_hw_device_encryption_key(passwd, (char*) crypt_ftr->crypto_type_name)) { if (!strcmp((char *)crypt_ftr->crypto_type_name, "aes-xts")) {
SLOGE("Hardware encryption key does not match"); if(!set_hw_device_encryption_key(passwd, (char*) crypt_ftr->crypto_type_name)) {
SLOGE("Hardware encryption key does not match");
}
} }
#endif #endif
@ -3106,7 +3113,7 @@ int cryptfs_enable_internal(char *howarg, int crypt_type, char *passwd,
#else #else
strlcpy((char *)crypt_ftr.crypto_type_name, "aes-xts", MAX_CRYPTO_TYPE_NAME_LEN); strlcpy((char *)crypt_ftr.crypto_type_name, "aes-xts", MAX_CRYPTO_TYPE_NAME_LEN);
rc = clear_hw_device_encryption_key(); rc = clear_hw_device_encryption_key();
if (!rc) { if (!rc) {
SLOGE("Error clearing device encryption hardware key. rc = %d", rc); SLOGE("Error clearing device encryption hardware key. rc = %d", rc);
} }
@ -3342,16 +3349,18 @@ int cryptfs_changepw(int crypt_type, const char *newpw)
free(adjusted_passwd); free(adjusted_passwd);
#ifdef CONFIG_HW_DISK_ENCRYPTION #ifdef CONFIG_HW_DISK_ENCRYPTION
if (crypt_type == CRYPT_TYPE_DEFAULT) { if (!strcmp((char *)crypt_ftr.crypto_type_name, "aes-xts")) {
int rc = update_hw_device_encryption_key(DEFAULT_PASSWORD, (char*) crypt_ftr.crypto_type_name); if (crypt_type == CRYPT_TYPE_DEFAULT) {
SLOGD("Update hardware encryption key to default for crypt_type: %d. rc = %d", crypt_type, rc); int rc = update_hw_device_encryption_key(DEFAULT_PASSWORD, (char*) crypt_ftr.crypto_type_name);
if (!rc) SLOGD("Update hardware encryption key to default for crypt_type: %d. rc = %d", crypt_type, rc);
return -1; if (!rc)
} else { return -1;
int rc = update_hw_device_encryption_key(newpw, (char*) crypt_ftr.crypto_type_name); } else {
SLOGD("Update hardware encryption key for crypt_type: %d. rc = %d", crypt_type, rc); int rc = update_hw_device_encryption_key(newpw, (char*) crypt_ftr.crypto_type_name);
if (!rc) SLOGD("Update hardware encryption key for crypt_type: %d. rc = %d", crypt_type, rc);
return -1; if (!rc)
return -1;
}
} }
#endif #endif
return 0; return 0;