proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-05-29 23:26:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Return a better error for keyring set up failure

Browse Source
This commit is contained in:
Richard Hughes 2017-09-17 09:33:53 +01:00
parent b5b4beb472
commit c07ac39ad1
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fu-engine.c
View File

@ -390,13 +390,20 @@ fu_engine_get_release_trust_flags (AsRelease *release,
kr = fu_engine_get_keyring_for_kind (keyring_kind, error); kr = fu_engine_get_keyring_for_kind (keyring_kind, error);
if (kr == NULL) if (kr == NULL)
return FALSE; return FALSE;
if (!fu_keyring_setup (kr, error)) if (!fu_keyring_setup (kr, error)) {
g_prefix_error (error, "failed to set up %s keyring: ",
fu_keyring_get_name (kr));
return FALSE; return FALSE;
if (!fu_keyring_add_public_keys (kr, pki_dir, error)) }
if (!fu_keyring_add_public_keys (kr, pki_dir, error)) {
g_prefix_error (error, "failed to add public keys to %s keyring: ",
fu_keyring_get_name (kr));
return FALSE; return FALSE;
}
kr_result = fu_keyring_verify_data (kr, blob_payload, blob_signature, &error_local); kr_result = fu_keyring_verify_data (kr, blob_payload, blob_signature, &error_local);
if (kr_result == NULL) { if (kr_result == NULL) {
g_warning ("untrusted as failed to verify: %s", g_warning ("untrusted as failed to verify from %s keyring: %s",
fu_keyring_get_name (kr),
error_local->message); error_local->message);
return TRUE; return TRUE;
} }

2
src/fu-keyring-gpg.c
View File

@ -107,7 +107,7 @@ fu_keyring_gpg_setup (FuKeyring *keyring, GError **error)
g_set_error (error, g_set_error (error,
FWUPD_ERROR, FWUPD_ERROR,
FWUPD_ERROR_INTERNAL, FWUPD_ERROR_INTERNAL,
"failed to startup GPG: %s", "failed to init: %s",
gpgme_strerror (rc)); gpgme_strerror (rc));
return FALSE; return FALSE;
} }