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

libostree: Actually trusted.gpg.d/*.gpg for GPG verification 

The intent of this code I'm fairly certain was to use *.gpg from the
trusted.gpg.d, directory.  But right now, we're only using
"pubring.gpg" from that directory, which is odd.

Let's fix this to use all keys ending in .gpg, which will also
include pubring.gpg.
This commit is contained in:
Colin Walters 2014-01-30 15:40:46 -05:00
parent ebe6207847
commit ffb19aef9a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libostree/ostree-gpg-verifier.c
View File

@ -77,17 +77,14 @@ ostree_gpg_verifier_initable_init (GInitable *initable,
OstreeGpgVerifier *self = (OstreeGpgVerifier*)initable; OstreeGpgVerifier *self = (OstreeGpgVerifier*)initable;
const char *default_keyring_path = g_getenv ("OSTREE_GPG_HOME"); const char *default_keyring_path = g_getenv ("OSTREE_GPG_HOME");
gs_unref_object GFile *default_keyring_dir = NULL; gs_unref_object GFile *default_keyring_dir = NULL;
gs_unref_object GFile *default_pubring_file = NULL;
gs_unref_object GFile *default_pubring = NULL; gs_unref_object GFile *default_pubring = NULL;
if (!default_keyring_path) if (!default_keyring_path)
default_keyring_path = DATADIR "/ostree/trusted.gpg.d/"; default_keyring_path = DATADIR "/ostree/trusted.gpg.d/";
default_keyring_dir = g_file_new_for_path (default_keyring_path); default_keyring_dir = g_file_new_for_path (default_keyring_path);
default_pubring_file = g_file_get_child (default_keyring_dir, "pubring.gpg"); if (!_ostree_gpg_verifier_add_keyring_dir (self, default_keyring_dir,
cancellable, error))
if (!_ostree_gpg_verifier_add_keyring (self, default_pubring_file,
cancellable, error))
goto out; goto out;
ret = TRUE; ret = TRUE;