lib/gpg: Show if GPG key has been revoked

Rather then showing the incorrect `BAD signature`.

Closes: #1872
Approved by: cgwalters
This commit is contained in:
Dan Nicholson authored and Atomic Bot committed 2019-06-19 17:17:11 +00:00
1 parent d714e622b8
commit d0ec319b6b
1 file changed
+7
+7
View File
@@ -621,6 +621,7 @@ ostree_gpg_verify_result_describe_variant (GVariant *variant,
gboolean valid; gboolean valid;
gboolean sig_expired; gboolean sig_expired;
gboolean key_expired; gboolean key_expired;
gboolean key_revoked;
gboolean key_missing; gboolean key_missing;
gsize len; gsize len;
@@ -642,6 +643,8 @@ ostree_gpg_verify_result_describe_variant (GVariant *variant,
"b", &sig_expired); "b", &sig_expired);
g_variant_get_child (variant, OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED, g_variant_get_child (variant, OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED,
"b", &key_expired); "b", &key_expired);
g_variant_get_child (variant, OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED,
"b", &key_revoked);
g_variant_get_child (variant, OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING, g_variant_get_child (variant, OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING,
"b", &key_missing); "b", &key_missing);
g_variant_get_child (variant, OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT, g_variant_get_child (variant, OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT,
@@ -703,6 +706,10 @@ ostree_gpg_verify_result_describe_variant (GVariant *variant,
"Good signature from \"%s <%s>\"\n", "Good signature from \"%s <%s>\"\n",
user_name, user_email); user_name, user_email);
} }
else if (key_revoked)
{
g_string_append (output_buffer, "Key revoked\n");
}
else if (sig_expired) else if (sig_expired)
{ {
g_string_append_printf (output_buffer, g_string_append_printf (output_buffer,