[git] GnuPG - branch, master, updated. gnupg-2.1.11-138-gd02de6c
by Werner Koch
cvs at cvs.gnupg.org
Tue Apr 19 17:58:07 CEST 2016
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 d02de6c0a4a55a2720cfa5caddcbfc4ce988a2ec (commit)
via 085b19fc9aa7f2f9b82a97824b117e71390964ec (commit)
from 6272f24312f2efe8707a7712858c85cd5a42e6fa (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 d02de6c0a4a55a2720cfa5caddcbfc4ce988a2ec
Author: Werner Koch <wk at gnupg.org>
Date: Tue Apr 19 17:47:24 2016 +0200
gpg: Improve UID selction of --quick-sign-key.
* g10/keyedit.c (keyedit_quick_sign): Improve UID selection and print
error for non-found userids.
--
GnuPG-bug-id: 2315
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 5994d9f..781a188 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -973,9 +973,12 @@ Directly sign a key from the passphrase without any further user
interaction. The @code{fpr} must be the verified primary fingerprint
of a key in the local keyring. If no @code{names} are given, all
useful user ids are signed; with given [@code{names}] only useful user
-ids matching one of theses names are signed. The command
- at option{--quick-lsign-key} marks the signatures as non-exportable. If
-such a non-exportable signature already exists the
+ids matching one of theses names are signed. By default, or if a name
+is prefixed with a '*', a case insensitive substring match is used.
+If a name is prefixed with a '=' a case sensitive exact match is done.
+
+The command @option{--quick-lsign-key} marks the signatures as
+non-exportable. If such a non-exportable signature already exists the
@option{--quick-sign-key} turns it into a exportable signature.
This command uses reasonable defaults and thus does not provide the
diff --git a/g10/keyedit.c b/g10/keyedit.c
index cd89325..84f0431 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -2927,12 +2927,11 @@ keyedit_quick_adduid (ctrl_t ctrl, const char *username, const char *newuid)
/* Unattended key signing function. If the key specifified by FPR is
- availabale and FPR is the primary fingerprint all user ids of the
- user ids of the key are signed using the default signing key. If
- UIDS is an empty list all usable UIDs are signed, if it is not
- empty, only those user ids matching one of the entries of the loist
- are signed. With LOCAL being true kthe signatures are marked as
- non-exportable. */
+ available and FPR is the primary fingerprint all user ids of the
+ key are signed using the default signing key. If UIDS is an empty
+ list all usable UIDs are signed, if it is not empty, only those
+ user ids matching one of the entries of the list are signed. With
+ LOCAL being true the signatures are marked as non-exportable. */
void
keyedit_quick_sign (ctrl_t ctrl, const char *fpr, strlist_t uids,
strlist_t locusr, int local)
@@ -3025,27 +3024,72 @@ keyedit_quick_sign (ctrl_t ctrl, const char *fpr, strlist_t uids,
menu_select_uid (keyblock, 0); /* Better clear the flags first. */
for (sl=uids; sl; sl = sl->next)
{
+ const char *name = sl->d;
+ int count = 0;
+
+ sl->flags &= ~(1|2); /* Clear flags used for error reporting. */
+
for (node = keyblock; node; node = node->next)
{
if (node->pkt->pkttype == PKT_USER_ID)
{
PKT_user_id *uid = node->pkt->pkt.user_id;
- if (!uid->attrib_data
- && ascii_memistr (uid->name, uid->len, sl->d))
+ if (uid->attrib_data)
+ ;
+ else if (*name == '='
+ && strlen (name+1) == uid->len
+ && !memcmp (uid->name, name + 1, uid->len))
+ { /* Exact match - we don't do a check for ambiguity
+ * in this case. */
+ node->flag |= NODFLG_SELUID;
+ if (any != -1)
+ {
+ sl->flags |= 1; /* Report as found. */
+ any = 1;
+ }
+ }
+ else if (ascii_memistr (uid->name, uid->len,
+ *name == '*'? name+1:name))
{
node->flag |= NODFLG_SELUID;
- any = 1;
+ if (any != -1)
+ {
+ sl->flags |= 1; /* Report as found. */
+ any = 1;
+ }
+ count++;
}
}
}
+
+ if (count > 1)
+ {
+ any = -1; /* Force failure at end. */
+ sl->flags |= 2; /* Report as ambiguous. */
+ }
}
- if (uids && !any)
+ /* Check whether all given user ids were found. */
+ for (sl=uids; sl; sl = sl->next)
+ if (!(sl->flags & 1))
+ any = -1; /* That user id was not found. */
+
+ /* Print an error if there was a problem with the user ids. */
+ if (uids && any < 1)
{
if (!opt.verbose)
show_key_with_all_names (ctrl, es_stdout, keyblock, 0, 0, 0, 0, 0, 1);
es_fflush (es_stdout);
+ for (sl=uids; sl; sl = sl->next)
+ {
+ if ((sl->flags & 2))
+ log_info (_("Invalid user ID '%s': %s\n"),
+ sl->d, gpg_strerror (GPG_ERR_AMBIGUOUS_NAME));
+ else if (!(sl->flags & 1))
+ log_info (_("Invalid user ID '%s': %s\n"),
+ sl->d, gpg_strerror (GPG_ERR_NOT_FOUND));
+ }
log_error ("%s %s", _("No matching user IDs."), _("Nothing to sign.\n"));
goto leave;
}
commit 085b19fc9aa7f2f9b82a97824b117e71390964ec
Author: Werner Koch <wk at gnupg.org>
Date: Tue Apr 19 17:45:27 2016 +0200
gpg: Avoid debug like output at start of --edit-key.
* g10/keyedit.c (check_all_keysigs): Print info only after something
has been modified.
--
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/g10/keyedit.c b/g10/keyedit.c
index e138efa..cd89325 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -752,7 +752,9 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs)
else
last_printed_component = current_component;
- if (last_printed_component->pkt->pkttype == PKT_USER_ID)
+ if (!modified)
+ ;
+ else if (last_printed_component->pkt->pkttype == PKT_USER_ID)
{
tty_printf ("uid ");
tty_print_utf8_string (last_printed_component
@@ -770,13 +772,17 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs)
pk_keyid_str (last_printed_component
->pkt->pkt.public_key));
- if (is_reordered)
- tty_printf (_(" (reordered signatures follow)"));
- tty_printf ("\n");
+ if (modified)
+ {
+ if (is_reordered)
+ tty_printf (_(" (reordered signatures follow)"));
+ tty_printf ("\n");
+ }
}
- print_one_sig (rc, kb, n, NULL, NULL, NULL, has_selfsig,
- 0, only_selfsigs);
+ if (modified)
+ print_one_sig (rc, kb, n, NULL, NULL, NULL, has_selfsig,
+ 0, only_selfsigs);
}
if (dump_sig_params)
-----------------------------------------------------------------------
Summary of changes:
doc/gpg.texi | 9 ++++---
g10/keyedit.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 72 insertions(+), 19 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list