Fix minor issues with previous change
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
diff --git a/cryptfs.c b/cryptfs.c
index bd7dd46..3b49a73 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -3573,7 +3573,8 @@
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 @@
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];