vbatts/sbsigntools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sbkeysync: keystore -> fs_keystore

Browse source 
To make it clear that these are key files.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
This commit is contained in:
Jeremy Kerr 2012-08-21 15:11:38 +08:00
parent 98911a7f4c
commit bdeb14370d
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/sbkeysync.c
View file

@ -107,7 +107,7 @@ struct key_database {
struct list_head keys; struct list_head keys;
}; };
struct keystore_entry { struct fs_keystore_entry {
const char *root; const char *root;
const char *name; const char *name;
uint8_t *data; uint8_t *data;
@ -115,7 +115,7 @@ struct keystore_entry {
struct list_node list; struct list_node list;
}; };
struct keystore { struct fs_keystore {
struct list_head keys; struct list_head keys;
}; };
@ -124,7 +124,7 @@ struct sync_context {
struct key_database *kek; struct key_database *kek;
struct key_database *db; struct key_database *db;
struct key_database *dbx; struct key_database *dbx;
struct keystore *keystore; struct fs_keystore *fs_keystore;
const char **keystore_dirs; const char **keystore_dirs;
unsigned int n_keystore_dirs; unsigned int n_keystore_dirs;
bool verbose; bool verbose;
@ -414,7 +414,7 @@ static int check_efivars_mount(const char *mountpoint)
* add file to keystore * add file to keystore
*/ */
static int keystore_entry_read(struct keystore_entry *ke) static int keystore_entry_read(struct fs_keystore_entry *ke)
{ {
const char *path; const char *path;
@ -430,10 +430,10 @@ static int keystore_entry_read(struct keystore_entry *ke)
return 0; return 0;
} }
static bool keystore_contains_file(struct keystore *keystore, static bool keystore_contains_file(struct fs_keystore *keystore,
const char *filename) const char *filename)
{ {
struct keystore_entry *ke; struct fs_keystore_entry *ke;
list_for_each(&keystore->keys, ke, list) { list_for_each(&keystore->keys, ke, list) {
if (!strcmp(ke->name, filename)) if (!strcmp(ke->name, filename))
@ -443,7 +443,7 @@ static bool keystore_contains_file(struct keystore *keystore,
return false; return false;
} }
static int update_keystore(struct keystore *keystore, const char *root) static int update_keystore(struct fs_keystore *keystore, const char *root)
{ {
unsigned int i; unsigned int i;
@ -460,7 +460,7 @@ static int update_keystore(struct keystore *keystore, const char *root)
continue; continue;
for (dirent = readdir(dir); dirent; dirent = readdir(dir)) { for (dirent = readdir(dir); dirent; dirent = readdir(dir)) {
struct keystore_entry *ke; struct fs_keystore_entry *ke;
if (dirent->d_name[0] == '.') if (dirent->d_name[0] == '.')
continue; continue;
@ -472,7 +472,7 @@ static int update_keystore(struct keystore *keystore, const char *root)
if (keystore_contains_file(keystore, filename)) if (keystore_contains_file(keystore, filename))
continue; continue;
ke = talloc(keystore, struct keystore_entry); ke = talloc(keystore, struct fs_keystore_entry);
ke->name = filename; ke->name = filename;
ke->root = root; ke->root = root;
talloc_steal(ke, ke->name); talloc_steal(ke, ke->name);
@ -491,24 +491,24 @@ static int update_keystore(struct keystore *keystore, const char *root)
static int read_keystore(struct sync_context *ctx) static int read_keystore(struct sync_context *ctx)
{ {
struct keystore *keystore; struct fs_keystore *keystore;
unsigned int i; unsigned int i;
keystore = talloc(ctx, struct keystore); keystore = talloc(ctx, struct fs_keystore);
list_head_init(&keystore->keys); list_head_init(&keystore->keys);
for (i = 0; i < ctx->n_keystore_dirs; i++) { for (i = 0; i < ctx->n_keystore_dirs; i++) {
update_keystore(keystore, ctx->keystore_dirs[i]); update_keystore(keystore, ctx->keystore_dirs[i]);
} }
ctx->keystore = keystore; ctx->fs_keystore = keystore;
return 0; return 0;
} }
static void print_keystore(struct keystore *keystore) static void print_keystore(struct fs_keystore *keystore)
{ {
struct keystore_entry *ke; struct fs_keystore_entry *ke;
printf("Filesystem keystore:\n"); printf("Filesystem keystore:\n");
@ -624,7 +624,7 @@ int main(int argc, char **argv)
if (ctx->verbose) { if (ctx->verbose) {
print_key_databases(ctx); print_key_databases(ctx);
print_keystore(ctx->keystore); print_keystore(ctx->fs_keystore);
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;