[git] GnuPG - branch, master, updated. gnupg-2.1.8-55-g13a3f65
by Werner Koch
cvs at cvs.gnupg.org
Thu Oct 1 16:28:48 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 13a3f65968f4a8205ca664cc46b1a53de4dc489b (commit)
from a9895a5a72a851c5fcc70f16d5f8f588cc885751 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 13a3f65968f4a8205ca664cc46b1a53de4dc489b
Author: Werner Koch <wk at gnupg.org>
Date: Thu Oct 1 16:22:29 2015 +0200
gpg: Add debug helper to --edit-keys's check sub-command.
* g10/keyedit.c (print_and_check_one_sig): Add arg "extended" and
print an asterisk for the chosen selfsig.
(check_all_keysigs): Add arg "only_selfsig"
(keyedit_menu) <cmdCHECK>: Add optional arg "selfsig".
--
Using "check selfsig" prints only the self-signatures and indicates
the chosen selfsig with an asterisk.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9d62afb..28e4f83 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -660,7 +660,8 @@ create a signature of any type desired.
@item check
@opindex keyedit:check
- Check the signatures on all selected user IDs.
+ Check the signatures on all selected user IDs. With the extra
+ option @code{selfsig} only self-signatures are shown.
@item adduid
@opindex keyedit:adduid
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 61aceb2..8d87a01 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -185,13 +185,15 @@ print_and_check_one_sig_colon (KBNODE keyblock, KBNODE node,
/*
- * Print information about a signature, check it and return true
- * if the signature is okay. NODE must be a signature packet.
+ * Print information about a signature, check it and return true if
+ * the signature is okay. NODE must be a signature packet. With
+ * EXTENDED set all possible signature list options will always be
+ * printed.
*/
static int
print_and_check_one_sig (KBNODE keyblock, KBNODE node,
int *inv_sigs, int *no_key, int *oth_err,
- int *is_selfsig, int print_without_key)
+ int *is_selfsig, int print_without_key, int extended)
{
PKT_signature *sig = node->pkt->pkt.signature;
int rc, sigrc;
@@ -241,9 +243,10 @@ print_and_check_one_sig (KBNODE keyblock, KBNODE node,
sig->flags.expired ? 'X' : ' ',
(sig->trust_depth > 9) ? 'T' : (sig->trust_depth >
0) ? '0' +
- sig->trust_depth : ' ', keystr (sig->keyid),
+ sig->trust_depth : ' ',
+ keystr (sig->keyid),
datestr_from_sig (sig));
- if (opt.list_options & LIST_SHOW_SIG_EXPIRE)
+ if ((opt.list_options & LIST_SHOW_SIG_EXPIRE) || extended )
tty_printf (" %s", expirestr_from_sig (sig));
tty_printf (" ");
if (sigrc == '%')
@@ -253,6 +256,8 @@ print_and_check_one_sig (KBNODE keyblock, KBNODE node,
else if (*is_selfsig)
{
tty_printf (is_rev ? _("[revocation]") : _("[self-signature]"));
+ if (extended && sig->flags.chosen_selfsig)
+ tty_printf ("*");
}
else
{
@@ -267,17 +272,20 @@ print_and_check_one_sig (KBNODE keyblock, KBNODE node,
}
tty_printf ("\n");
- if (sig->flags.policy_url && (opt.list_options & LIST_SHOW_POLICY_URLS))
+ if (sig->flags.policy_url
+ && ((opt.list_options & LIST_SHOW_POLICY_URLS) || extended))
show_policy_url (sig, 3, 0);
- if (sig->flags.notation && (opt.list_options & LIST_SHOW_NOTATIONS))
+ if (sig->flags.notation
+ && ((opt.list_options & LIST_SHOW_NOTATIONS) || extended))
show_notation (sig, 3, 0,
((opt.
list_options & LIST_SHOW_STD_NOTATIONS) ? 1 : 0) +
((opt.
list_options & LIST_SHOW_USER_NOTATIONS) ? 2 : 0));
- if (sig->flags.pref_ks && (opt.list_options & LIST_SHOW_KEYSERVER_URLS))
+ if (sig->flags.pref_ks
+ && ((opt.list_options & LIST_SHOW_KEYSERVER_URLS) || extended))
show_keyserver_url (sig, 3, 0);
}
@@ -291,7 +299,7 @@ print_and_check_one_sig (KBNODE keyblock, KBNODE node,
* Returns true if error found.
*/
static int
-check_all_keysigs (KBNODE keyblock, int only_selected)
+check_all_keysigs (KBNODE keyblock, int only_selected, int only_selfsigs)
{
KBNODE kbctx;
KBNODE node;
@@ -302,10 +310,16 @@ check_all_keysigs (KBNODE keyblock, int only_selected)
int mis_selfsig = 0;
int selected = !only_selected;
int anyuid = 0;
+ u32 keyid[2];
for (kbctx = NULL; (node = walk_kbnode (keyblock, &kbctx, 0));)
{
- if (node->pkt->pkttype == PKT_USER_ID)
+ if (node->pkt->pkttype == PKT_PUBLIC_KEY)
+ {
+ if (only_selfsigs)
+ keyid_from_pk (node->pkt->pkt.public_key, keyid);
+ }
+ else if (node->pkt->pkttype == PKT_USER_ID)
{
PKT_user_id *uid = node->pkt->pkt.user_id;
@@ -327,9 +341,14 @@ check_all_keysigs (KBNODE keyblock, int only_selected)
|| node->pkt->pkt.signature->sig_class == 0x30))
{
int selfsig;
-
- if (print_and_check_one_sig (keyblock, node, &inv_sigs,
- &no_key, &oth_err, &selfsig, 0))
+ PKT_signature *sig = node->pkt->pkt.signature;
+
+ if (only_selfsigs
+ && !(keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]))
+ ; /* Not a selfsig but we want only selfsigs - skip. */
+ else if (print_and_check_one_sig (keyblock, node, &inv_sigs,
+ &no_key, &oth_err, &selfsig,
+ 0, only_selfsigs))
{
if (selfsig)
has_selfsig = 1;
@@ -1679,7 +1698,8 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
break;
case cmdCHECK:
- check_all_keysigs (keyblock, count_selected_uids (keyblock));
+ check_all_keysigs (keyblock, count_selected_uids (keyblock),
+ !strcmp (arg_string, "selfsig"));
break;
case cmdSIGN:
@@ -3601,7 +3621,7 @@ menu_delsig (KBNODE pub_keyblock)
else
valid = print_and_check_one_sig (pub_keyblock, node,
&inv_sig, &no_key, &other_err,
- &selfsig, 1);
+ &selfsig, 1, 0);
if (valid)
{
-----------------------------------------------------------------------
Summary of changes:
doc/gpg.texi | 3 ++-
g10/keyedit.c | 50 +++++++++++++++++++++++++++++++++++---------------
2 files changed, 37 insertions(+), 16 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list