shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-16 10:50:43 +03:00
Code Issues Projects Releases Wiki Activity

lib/repo: Allow preparing GPG verifier without global keyrings

Browse Source 
Currently the verifier decides whether to include the global keyrings
based on whether the specified remote has its own keyring or not. Allow
callers to exclude the global keyrings even when that's not the case.
This will be used in a subsequent commit in order to get the GPG keys
only associated with a remote.
This commit is contained in:
Dan Nicholson 2021-07-14 11:04:59 -06:00
parent c8715c123e
commit fc073654dc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5343,12 +5343,12 @@ _ostree_repo_gpg_prepare_verifier (OstreeRepo *self,
const gchar *remote_name,
GFile *keyringdir,
GFile *extra_keyring,
gboolean add_global_keyrings,
OstreeGpgVerifier **out_verifier,
GCancellable *cancellable,
GError **error)
{
g_autoptr(OstreeGpgVerifier) verifier = _ostree_gpg_verifier_new ();
gboolean add_global_keyring_dir = TRUE;
if (remote_name == OSTREE_ALL_REMOTES)
{
@ -5375,7 +5375,7 @@ _ostree_repo_gpg_prepare_verifier (OstreeRepo *self,
if (keyring_data != NULL)
{
_ostree_gpg_verifier_add_keyring_data (verifier, keyring_data, remote->keyring);
add_global_keyring_dir = FALSE;
add_global_keyrings = FALSE;
}
g_auto(GStrv) gpgkeypath_list = NULL;
@ -5397,7 +5397,7 @@ _ostree_repo_gpg_prepare_verifier (OstreeRepo *self,
}
}
if (add_global_keyring_dir)
if (add_global_keyrings)
{
/* Use the deprecated global keyring directory. */
if (!_ostree_gpg_verifier_add_global_keyring_dir (verifier, cancellable, error))
@ -5436,6 +5436,7 @@ _ostree_repo_gpg_verify_data_internal (OstreeRepo *self,
remote_name,
keyringdir,
extra_keyring,
TRUE,
&verifier,
cancellable,
error))