dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-06-24 08:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

tpm2-setup: split out SRK setup into a function of its own

Browse Source
This commit is contained in:
Lennart Poettering
2024-06-04 16:36:39 +02:00
parent 0196abbd10
commit 2da86d62ff
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/tpm2-setup/tpm2-setup.c
View File

@@ -252,22 +252,9 @@ static int load_public_key_tpm2(struct public_key_data *ret) {
return 0;
}
static int run(int argc, char *argv[]) {
static int setup_srk(void) {
int r;
log_setup();
r = parse_argv(argc, argv);
if (r <= 0)
return r;
if (arg_graceful && !tpm2_is_fully_supported()) {
log_notice("No complete TPM2 support detected, exiting gracefully.");
return EXIT_SUCCESS;
}
umask(0022);
_cleanup_(public_key_data_done) struct public_key_data runtime_key = {}, persistent_key = {}, tpm2_key = {};
r = load_public_key_disk(TPM2_SRK_PEM_RUNTIME_PATH, &runtime_key);
@@ -390,4 +377,23 @@ static int run(int argc, char *argv[]) {
return 0;
}
static int run(int argc, char *argv[]) {
int r;
log_setup();
r = parse_argv(argc, argv);
if (r <= 0)
return r;
if (arg_graceful && !tpm2_is_fully_supported()) {
log_notice("No complete TPM2 support detected, exiting gracefully.");
return EXIT_SUCCESS;
}
umask(0022);
return setup_srk();
}
DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);