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

Merge "Add command for setting the key binding seed" am: 2d76731968 am: 7aec273c8d am: a3f7a54366

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1757970

Change-Id: Ic650b8d63d1865f9db8900424243257e60cc2a66
This commit is contained in:
Keith Mok 2021-07-15 21:45:56 +00:00 committed by Automerger Merge Worker
commit 879038b619
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Android.bp
View file

@ -220,11 +220,16 @@ cc_binary {
name: "vdc",
defaults: ["vold_default_flags"],
srcs: ["vdc.cpp"],
srcs: [
"vdc.cpp",
"Utils.cpp",
],
shared_libs: [
"libbase",
"libbinder",
"libcutils",
"liblogwrap",
"libselinux",
"libutils",
],
static_libs: [

24
vdc.cpp
View file

@ -28,6 +28,7 @@
#include <sys/types.h>
#include <sys/un.h>
#include "Utils.h"
#include "android/os/IVold.h"
#include <android-base/logging.h>
@ -37,6 +38,7 @@
#include <android-base/strings.h>
#include <binder/IServiceManager.h>
#include <binder/Status.h>
#include <utils/Errors.h>
#include <private/android_filesystem_config.h>
@ -64,6 +66,26 @@ static void checkStatus(std::vector<std::string>& cmd, android::binder::Status s
exit(ENOTTY);
}
static void bindkeys(std::vector<std::string>& args, const android::sp<android::os::IVold>& vold) {
std::string raw_bytes;
const char* seed_value;
seed_value = getenv("SEED_VALUE");
if (seed_value == NULL) {
LOG(ERROR) << "Empty seed";
exit(EINVAL);
}
android::status_t status = android::vold::HexToStr(seed_value, raw_bytes);
if (status != android::OK) {
LOG(ERROR) << "Extraction of seed failed: " << status;
exit(status);
}
std::vector<uint8_t> seed{raw_bytes.begin(), raw_bytes.end()};
checkStatus(args, vold->setStorageBindingSeed(seed));
}
int main(int argc, char** argv) {
setenv("ANDROID_LOG_TAGS", "*:v", 1);
if (getppid() == 1) {
@ -106,6 +128,8 @@ int main(int argc, char** argv) {
checkStatus(args, vold->shutdown());
} else if (args[0] == "volume" && args[1] == "reset") {
checkStatus(args, vold->reset());
} else if (args[0] == "cryptfs" && args[1] == "bindkeys") {
bindkeys(args, vold);
} else if (args[0] == "cryptfs" && args[1] == "mountFstab" && args.size() == 4) {
checkStatus(args, vold->mountFstab(args[2], args[3]));
} else if (args[0] == "cryptfs" && args[1] == "encryptFstab" && args.size() == 6) {