am 4571383c: Merge "Use default key permissions for ext4enc"

* commit '4571383cbf711df21d99529448277966e7ffb11e':
  Use default key permissions for ext4enc
This commit is contained in:
Paul Lawrence 2015-05-06 22:45:32 +00:00 committed by Android Git Automerger
commit 621d12e7e3

View file

@ -359,13 +359,6 @@ int e4crypt_check_passwd(const char* path, const char* password)
SLOGI("Added key %d (%s) to keyring %d in process %d",
key_id, ref.c_str(), device_keyring, getpid());
// ext4enc:TODO set correct permissions
long result = keyctl_setperm(key_id, 0x3f3f3f3f);
if (result) {
SLOGE("KEYCTL_SETPERM failed with error %ld", result);
return -1;
}
// Save reference to key so we can set policy later
if (!props.Set(properties::ref, raw_ref)) {
SLOGE("Cannot save key reference");