diff options
| author | Denis Pynkin <denis.pynkin@collabora.com> | 2019-10-07 02:59:15 +0300 |
|---|---|---|
| committer | Denis Pynkin <denis.pynkin@collabora.com> | 2020-03-25 15:23:54 +0300 |
| commit | bc4488692c68a2148b921efe94ea4dc2cee24725 (patch) | |
| tree | de9b3bc52fac3681eaf4ef4dd0c432133d008bb1 /src/libostree/ostree-sign.c | |
| parent | 95ab57c17ee2fcc93ee53b9a46ee6ed0a1c07b2b (diff) | |
| download | ostree-bc4488692c68a2148b921efe94ea4dc2cee24725.tar.gz | |
lib/sign: public API optimisation
Removed from public `ostree_sign_detached_metadata_append` function.
Renamed `metadata_verify` into `data_verify` to fit to real
functionality.
Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
Diffstat (limited to 'src/libostree/ostree-sign.c')
| -rw-r--r-- | src/libostree/ostree-sign.c | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/src/libostree/ostree-sign.c b/src/libostree/ostree-sign.c index 6e67acaa..b1975215 100644 --- a/src/libostree/ostree-sign.c +++ b/src/libostree/ostree-sign.c @@ -153,13 +153,26 @@ gboolean ostree_sign_data (OstreeSign *self, return OSTREE_SIGN_GET_IFACE (self)->data (self, data, signature, cancellable, error); } +gboolean +ostree_sign_data_verify (OstreeSign *self, + GBytes *data, + GVariant *signatures, + GError **error) +{ + g_debug ("%s enter", __FUNCTION__); + g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE); + g_return_val_if_fail (OSTREE_SIGN_GET_IFACE (self)->data_verify != NULL, FALSE); + + return OSTREE_SIGN_GET_IFACE (self)->data_verify(self, data, signatures, error); +} + /* * Adopted version of _ostree_detached_metadata_append_gpg_sig () */ -GVariant * -ostree_sign_detached_metadata_append (OstreeSign *self, - GVariant *existing_metadata, - GBytes *signature_bytes) +static GVariant * +_sign_detached_metadata_append (OstreeSign *self, + GVariant *existing_metadata, + GBytes *signature_bytes) { g_debug ("%s enter", __FUNCTION__); g_return_val_if_fail (signature_bytes != NULL, FALSE); @@ -189,20 +202,6 @@ ostree_sign_detached_metadata_append (OstreeSign *self, return g_variant_dict_end (&metadata_dict); } - -gboolean -ostree_sign_metadata_verify (OstreeSign *self, - GBytes *data, - GVariant *signatures, - GError **error) -{ - g_debug ("%s enter", __FUNCTION__); - g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE); - g_return_val_if_fail (OSTREE_SIGN_GET_IFACE (self)->metadata_verify != NULL, FALSE); - - return OSTREE_SIGN_GET_IFACE (self)->metadata_verify(self, data, signatures, error); -} - gboolean ostree_sign_commit_verify (OstreeSign *self, OstreeRepo *repo, @@ -243,7 +242,7 @@ ostree_sign_commit_verify (OstreeSign *self, signature_format); - return ostree_sign_metadata_verify (self, + return ostree_sign_data_verify (self, signed_data, signatures, error); @@ -325,8 +324,6 @@ ostree_sign_commit (OstreeSign *self, error)) return glnx_prefix_error (error, "Failed to read detached metadata"); - // TODO: d4s: check if already signed? - commit_data = g_variant_get_data_as_bytes (commit_variant); if (!ostree_sign_data (self, commit_data, &signature, @@ -334,7 +331,7 @@ ostree_sign_commit (OstreeSign *self, return glnx_prefix_error (error, "Not able to sign the cobject"); new_metadata = - ostree_sign_detached_metadata_append (self, old_metadata, signature); + _sign_detached_metadata_append (self, old_metadata, signature); if (!ostree_repo_write_commit_detached_metadata (repo, commit_checksum, |