diff options
author | Victor Hsieh <victorhsieh@google.com> | 2019-03-20 15:52:45 -0700 |
---|---|---|
committer | Victor Hsieh <victorhsieh@google.com> | 2019-03-22 09:18:00 -0700 |
commit | 59183120c29e5e2747222b24de09484b7cd8cf17 (patch) | |
tree | e95aee4f80ae6f695c3b51cc9c0bf1d702d7c92b /libkeyutils/mini_keyctl.cpp | |
parent | b4ef0beb990d02600cad57096bcd20c9d646c8fa (diff) | |
download | system_core-59183120c29e5e2747222b24de09484b7cd8cf17.tar.gz system_core-59183120c29e5e2747222b24de09484b7cd8cf17.tar.bz2 system_core-59183120c29e5e2747222b24de09484b7cd8cf17.zip |
Initialize fs-verity keys in shell script
This gives us two benefits:
- Better compatibility to keyctl(1), which doesn't have "dadd"
- Pave the way to specify key's security labels, since keyctl(1)
doesn't support, and we want to avoid adding incompatible option.
Test: See keys loaded in /proc/keys
Bug: 128607724
Change-Id: Ia45f6e9dea80d037c0820cf1fd2bc9d7c8bb6302
Diffstat (limited to 'libkeyutils/mini_keyctl.cpp')
-rw-r--r-- | libkeyutils/mini_keyctl.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libkeyutils/mini_keyctl.cpp b/libkeyutils/mini_keyctl.cpp index e09c864e1..fe89e62ab 100644 --- a/libkeyutils/mini_keyctl.cpp +++ b/libkeyutils/mini_keyctl.cpp @@ -30,7 +30,6 @@ static void Usage(int exit_code) { fprintf(stderr, "usage: mini-keyctl <action> [args,]\n"); fprintf(stderr, " mini-keyctl add <type> <desc> <data> <keyring>\n"); fprintf(stderr, " mini-keyctl padd <type> <desc> <keyring>\n"); - fprintf(stderr, " mini-keyctl dadd <type> <desc_prefix> <cert_dir> <keyring>\n"); fprintf(stderr, " mini-keyctl unlink <key> <keyring>\n"); fprintf(stderr, " mini-keyctl restrict_keyring <keyring>\n"); fprintf(stderr, " mini-keyctl security <key>\n"); @@ -56,14 +55,6 @@ int main(int argc, const char** argv) { std::string data = argv[4]; std::string keyring = argv[5]; return Add(type, desc, data, keyring); - } else if (action == "dadd") { - if (argc != 6) Usage(1); - std::string type = argv[2]; - // The key description contains desc_prefix and an index. - std::string desc_prefix = argv[3]; - std::string cert_dir = argv[4]; - std::string keyring = argv[5]; - return AddCertsFromDir(type, desc_prefix, cert_dir, keyring); } else if (action == "padd") { if (argc != 5) Usage(1); std::string type = argv[2]; |