diff options
| author | Jeremy Kerr <jeremy.kerr@canonical.com> | 2012-08-21 12:10:25 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jeremy.kerr@canonical.com> | 2012-08-24 20:02:15 +0800 |
| commit | 1a431a5a2d15bec05fdc8bb1b72349bd1005fbed (patch) | |
| tree | 3f10faae07d7b1d8d9b068f568d8053c12624b96 | |
| parent | add8d00f31dcb48bc40499eedc86fc4d5c040d84 (diff) | |
| download | sbsigntools-1a431a5a2d15bec05fdc8bb1b72349bd1005fbed.tar.gz | |
sbkeysync: add keystore_entry->root
Helps to show where the keys are loaded from.
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
| -rw-r--r-- | src/sbkeysync.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/sbkeysync.c b/src/sbkeysync.c index 29898fb..1af0771 100644 --- a/src/sbkeysync.c +++ b/src/sbkeysync.c @@ -109,6 +109,7 @@ struct key_database { }; struct keystore_entry { + const char *root; const char *name; uint8_t *data; size_t len; @@ -414,11 +415,11 @@ static int check_efivars_mount(const char *mountpoint) * add file to keystore */ -static int keystore_entry_read(struct keystore_entry *ke, const char *root) +static int keystore_entry_read(struct keystore_entry *ke) { const char *path; - path = talloc_asprintf(ke, "%s/%s", root, ke->name); + path = talloc_asprintf(ke, "%s/%s", ke->root, ke->name); if (fileio_read_file(ke, path, &ke->data, &ke->len)) { talloc_free(ke); @@ -474,9 +475,10 @@ static int update_keystore(struct keystore *keystore, const char *root) ke = talloc(keystore, struct keystore_entry); ke->name = filename; + ke->root = root; talloc_steal(ke, ke->name); - if (keystore_entry_read(ke, root)) + if (keystore_entry_read(ke)) talloc_free(ke); else list_add(&keystore->keys, &ke->list); @@ -512,7 +514,7 @@ static void print_keystore(struct keystore *keystore) printf("Filesystem keystore:\n"); list_for_each(&keystore->keys, ke, list) - printf(" %s [%zd bytes]\n", ke->name, ke->len); + printf(" %s/%s [%zd bytes]\n", ke->root, ke->name, ke->len); } static struct option options[] = { |