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

Fix minor issues with previous change

Browse source 
New style logging
Remove set/get field from e4crypt
Save keys to temp file then rename

See https://googleplex-android-review.git.corp.google.com/#/c/858922/

Change-Id: I454c3f78489b491ffc1230a70dce64935e4e0f8a
This commit is contained in:
Paul Lawrence 2016-02-03 13:39:13 -08:00
parent aec34dfb1d
commit 5a06a6481b
3 changed files with 20 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Ext4Crypt.cpp
View file

@ -73,6 +73,9 @@ namespace {
static_assert(key_length % 8 == 0,
"Key length must be multiple of 8 bits");
const std::string device_key_leaf = "/unencrypted/key";
const std::string device_key_temp = "/unencrypted/temp";
const std::string user_key_dir = std::string() + DATA_MNT_POINT + "/misc/vold/user_keys";
const std::string user_key_temp = user_key_dir + "/temp";
@ -190,31 +193,6 @@ static bool install_key(const std::string &key, std::string &raw_ref)
return true;
}
int e4crypt_get_field(const char* path, const char* fieldname,
char* value, size_t len)
{
auto v = GetProps(path).GetChild(properties::props)
.Get<std::string>(fieldname);
if (v == "") {
return CRYPTO_GETFIELD_ERROR_NO_FIELD;
}
if (v.length() >= len) {
return CRYPTO_GETFIELD_ERROR_BUF_TOO_SMALL;
}
strlcpy(value, v.c_str(), len);
return 0;
}
int e4crypt_set_field(const char* path, const char* fieldname,
const char* value)
{
return GetProps(path).GetChild(properties::props)
.Set(fieldname, std::string(value)) ? 0 : -1;
}
static std::string get_de_key_path(userid_t user_id) {
return StringPrintf("%s/de/%d", user_key_dir.c_str(), user_id);
}
@ -377,15 +355,23 @@ int e4crypt_enable(const char* path)
}
std::string device_key;
std::string device_key_path = std::string(path) + "/unencrypted/device_key";
std::string device_key_path = std::string(path) + device_key_leaf;
if (!android::vold::retrieveKey(device_key_path, device_key)) {
LOG(INFO) << "Creating new key";
if (!random_key(device_key)) {
return -1;
}
if (!android::vold::storeKey(device_key_path, device_key)) {
return -1;
std::string key_temp = std::string(path) + device_key_temp;
if (path_exists(key_temp)) {
android::vold::destroyKey(key_temp);
}
if (!android::vold::storeKey(key_temp, device_key)) return false;
if (rename(key_temp.c_str(), device_key_path.c_str()) != 0) {
PLOG(ERROR) << "Unable to move new key to location: "
<< device_key_path;
return false;
}
}
@ -397,12 +383,12 @@ int e4crypt_enable(const char* path)
UnencryptedProperties props(path);
if (!props.Remove(properties::ref)) {
SLOGE("Failed to remove key ref");
LOG(ERROR) << "Failed to remove key ref";
return -1;
}
if (!props.Set(properties::ref, device_key_ref)) {
SLOGE("Cannot save key reference");
LOG(ERROR) << "Cannot save key reference";
return -1;
}

4
Ext4Crypt.h
View file

@ -24,10 +24,6 @@ __BEGIN_DECLS
// General functions
int e4crypt_enable(const char* path);
int e4crypt_crypto_complete(const char* path);
int e4crypt_get_field(const char* path, const char* fieldname,
char* value, size_t len);
int e4crypt_set_field(const char* path, const char* fieldname,
const char* value);
int e4crypt_init_user0();
int e4crypt_vold_create_user_key(userid_t user_id, int serial, bool ephemeral);

6
cryptfs.c
View file

@ -3573,7 +3573,8 @@ static int persist_count_keys(const char *fieldname)
int cryptfs_getfield(const char *fieldname, char *value, int len)
{
if (e4crypt_crypto_complete(DATA_MNT_POINT) == 0) {
return e4crypt_get_field(DATA_MNT_POINT, fieldname, value, len);
SLOGE("Cannot get field when file encrypted");
return -1;
}
char temp_value[PROPERTY_VALUE_MAX];
@ -3638,7 +3639,8 @@ out:
int cryptfs_setfield(const char *fieldname, const char *value)
{
if (e4crypt_crypto_complete(DATA_MNT_POINT) == 0) {
return e4crypt_set_field(DATA_MNT_POINT, fieldname, value);
SLOGE("Cannot set field when file encrypted");
return -1;
}
char encrypted_state[PROPERTY_VALUE_MAX];