shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-11 20:58:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2984 from alexlarsson/prepare-root-no-raw-key

Browse Source 
prepare-root: Only support base64 formated public key files
This commit is contained in:
Colin Walters 2023-08-16 09:05:39 -04:00 committed by GitHub
commit 083bad8cf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/switchroot/ostree-prepare-root.c
View File

@ -330,23 +330,16 @@ load_composefs_config (GKeyFile *config, GError **error)
return glnx_prefix_error_null (error, "Reading public key file '%s'",
ret->signature_pubkey);
/* Raw binary form if right size */
if (pubkeys_size == OSTREE_SIGN_ED25519_PUBKEY_SIZE)
g_ptr_array_add (ret->pubkeys, g_bytes_new_take (g_steal_pointer (&pubkeys), pubkeys_size));
else /* otherwise text with base64 key per line */
g_auto (GStrv) lines = g_strsplit (pubkeys, "\n", -1);
for (char **iter = lines; *iter; iter++)
{
g_auto (GStrv) lines = g_strsplit (pubkeys, "\n", -1);
for (char **iter = lines; *iter; iter++)
{
const char *line = *iter;
if (!*line)
continue;
const char *line = *iter;
if (!*line)
continue;
gsize pubkey_size;
g_autofree guchar *pubkey = g_base64_decode (line, &pubkey_size);
g_ptr_array_add (ret->pubkeys,
g_bytes_new_take (g_steal_pointer (&pubkey), pubkey_size));
}
gsize pubkey_size;
g_autofree guchar *pubkey = g_base64_decode (line, &pubkey_size);
g_ptr_array_add (ret->pubkeys, g_bytes_new_take (g_steal_pointer (&pubkey), pubkey_size));
}
if (ret->pubkeys->len == 0)