fb486660ca
Make vold log warnings and errors to the kernel log until both init_user0 has run and /data is mounted. Previously it only logged errors, and not warnings, to the kernel log until /data is mounted. This is helpful to diagnose failures of init_user0, since adb still isn't started by that point. Also, error messages can be misleading without seeing related warning messages, e.g. the following which is expected on many devices: E vold : keystore2 Keystore generateKey returned service specific error: -67 W vold : Failed to generate rollback-resistant key. This is expected if keystore doesn't support rollback resistance. Falling back to non-rollback-resistant key. Therefore, increase the log level to WARNING and above. Test: Intentionally broke fscrypt_init_user0(), then verified that the error and warning messages appear in the kernel log on Cuttlefish. Bug: 205314634 Bug: 222540970 Change-Id: Ia751f7c88cbf28caf81e891a518953cc0cee911e
40 lines
1.6 KiB
C++
40 lines
1.6 KiB
C++
/*
|
|
* Copyright (C) 2015 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 <string>
|
|
#include <vector>
|
|
|
|
#include <cutils/multiuser.h>
|
|
|
|
bool fscrypt_initialize_systemwide_keys();
|
|
|
|
bool fscrypt_init_user0();
|
|
extern bool fscrypt_init_user0_done;
|
|
bool fscrypt_vold_create_user_key(userid_t user_id, int serial, bool ephemeral);
|
|
bool fscrypt_destroy_user_key(userid_t user_id);
|
|
bool fscrypt_add_user_key_auth(userid_t user_id, int serial, const std::string& secret);
|
|
bool fscrypt_clear_user_key_auth(userid_t user_id, int serial, const std::string& secret);
|
|
bool fscrypt_fixate_newest_user_key_auth(userid_t user_id);
|
|
|
|
std::vector<int> fscrypt_get_unlocked_users();
|
|
bool fscrypt_unlock_user_key(userid_t user_id, int serial, const std::string& secret);
|
|
bool fscrypt_lock_user_key(userid_t user_id);
|
|
|
|
bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_id, int serial,
|
|
int flags);
|
|
bool fscrypt_destroy_user_storage(const std::string& volume_uuid, userid_t user_id, int flags);
|
|
|
|
bool fscrypt_destroy_volume_keys(const std::string& volume_uuid);
|