packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Add definitions for GPG signature metadata 

_OSTREE_METADATA_GPGSIGS_NAME
_OSTREE_METADATA_GPGSIGS_TYPE
This commit is contained in:
Matthew Barnes 2015-03-02 14:30:52 -05:00
parent fdda36eb77
commit c04f9f47e3
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libostree/ostree-core-private.h
View File

@ -125,6 +125,9 @@ _ostree_loose_path_with_suffix (char *buf,
OstreeRepoMode repo_mode, OstreeRepoMode repo_mode,
const char *suffix); const char *suffix);
#define _OSTREE_METADATA_GPGSIGS_NAME "ostree.gpgsigs"
#define _OSTREE_METADATA_GPGSIGS_TYPE G_VARIANT_TYPE ("aay")
GVariant * GVariant *
_ostree_detached_metadata_append_gpg_sig (GVariant *existing_metadata, _ostree_detached_metadata_append_gpg_sig (GVariant *existing_metadata,
GBytes *signature_bytes); GBytes *signature_bytes);

8
src/libostree/ostree-core.c
View File

@ -1933,18 +1933,18 @@ _ostree_detached_metadata_append_gpg_sig (GVariant *existing_metadata,
if (existing_metadata) if (existing_metadata)
{ {
builder = ot_util_variant_builder_from_variant (existing_metadata, G_VARIANT_TYPE ("a{sv}")); builder = ot_util_variant_builder_from_variant (existing_metadata, G_VARIANT_TYPE ("a{sv}"));
signaturedata = g_variant_lookup_value (existing_metadata, "ostree.gpgsigs", G_VARIANT_TYPE ("aay")); signaturedata = g_variant_lookup_value (existing_metadata, _OSTREE_METADATA_GPGSIGS_NAME, _OSTREE_METADATA_GPGSIGS_TYPE);
if (signaturedata) if (signaturedata)
signature_builder = ot_util_variant_builder_from_variant (signaturedata, G_VARIANT_TYPE ("aay")); signature_builder = ot_util_variant_builder_from_variant (signaturedata, _OSTREE_METADATA_GPGSIGS_TYPE);
} }
if (!builder) if (!builder)
builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}")); builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
if (!signature_builder) if (!signature_builder)
signature_builder = g_variant_builder_new (G_VARIANT_TYPE ("aay")); signature_builder = g_variant_builder_new (_OSTREE_METADATA_GPGSIGS_TYPE);
g_variant_builder_add (signature_builder, "@ay", ot_gvariant_new_ay_bytes (signature_bytes)); g_variant_builder_add (signature_builder, "@ay", ot_gvariant_new_ay_bytes (signature_bytes));
g_variant_builder_add (builder, "{sv}", "ostree.gpgsigs", g_variant_builder_end (signature_builder)); g_variant_builder_add (builder, "{sv}", _OSTREE_METADATA_GPGSIGS_NAME, g_variant_builder_end (signature_builder));
return g_variant_ref_sink (g_variant_builder_end (builder)); return g_variant_ref_sink (g_variant_builder_end (builder));
} }

4
src/libostree/ostree-repo.c
View File

@ -3312,7 +3312,9 @@ _ostree_repo_gpg_verify_file_with_metadata (OstreeRepo *self,
} }
if (metadata) if (metadata)
signaturedata = g_variant_lookup_value (metadata, "ostree.gpgsigs", G_VARIANT_TYPE ("aay")); signaturedata = g_variant_lookup_value (metadata,
_OSTREE_METADATA_GPGSIGS_NAME,
_OSTREE_METADATA_GPGSIGS_TYPE);
if (!signaturedata) if (!signaturedata)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,