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

lib/sign: public API optimisation

Browse Source 
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>
This commit is contained in:
Denis Pynkin committed 2020-03-25 15:23:54 +03:00
1 parent 95ab57c17e
commit bc4488692c
9 files changed
+75 -91
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/libostree/ostree-sign.c
+19 -22
View File
@@ -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,