From c04f9f47e3ca3b51c84eb71013ced524a2d659ba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 2 Mar 2015 14:30:52 -0500 Subject: [PATCH] core: Add definitions for GPG signature metadata _OSTREE_METADATA_GPGSIGS_NAME _OSTREE_METADATA_GPGSIGS_TYPE --- src/libostree/ostree-core-private.h | 3 +++ src/libostree/ostree-core.c | 8 ++++---- src/libostree/ostree-repo.c | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h index 8d6cb93b..f78a820c 100644 --- a/src/libostree/ostree-core-private.h +++ b/src/libostree/ostree-core-private.h @@ -125,6 +125,9 @@ _ostree_loose_path_with_suffix (char *buf, OstreeRepoMode repo_mode, const char *suffix); +#define _OSTREE_METADATA_GPGSIGS_NAME "ostree.gpgsigs" +#define _OSTREE_METADATA_GPGSIGS_TYPE G_VARIANT_TYPE ("aay") + GVariant * _ostree_detached_metadata_append_gpg_sig (GVariant *existing_metadata, GBytes *signature_bytes); diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c index 9a4aa0f5..83aa688d 100644 --- a/src/libostree/ostree-core.c +++ b/src/libostree/ostree-core.c @@ -1933,18 +1933,18 @@ _ostree_detached_metadata_append_gpg_sig (GVariant *existing_metadata, if (existing_metadata) { 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) - 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) builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}")); 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 (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)); } diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index a05d481d..d8e5ab7c 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -3312,7 +3312,9 @@ _ostree_repo_gpg_verify_file_with_metadata (OstreeRepo *self, } 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) { g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,