security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: Fix error checking and improve error reporting.

Browse Source 
* g10/gpg.c (check_user_ids): Differentiate between a second result
and an error.  If the key specification is ambiguous or an error
occurs, set RC appropriately.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
Reported-by: Werner Koch <wk@gnupg.org>
Suggested-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
Neal H. Walfield 2015-11-16 10:34:01 +01:00
parent 3689c2105a
commit 8e2bea22b0
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
g10/gpg.c
View File

@ -2196,8 +2196,8 @@ check_user_ids (strlist_t *sp,
/* Continue the search. */ /* Continue the search. */
err = keydb_search (hd, &desc, 1, NULL); err = keydb_search (hd, &desc, 1, NULL);
if (! (gpg_err_code (err) == GPG_ERR_NOT_FOUND if (! err)
|| gpg_err_code (err) == GPG_ERR_EOF)) /* Another result! */
{ {
char fingerprint_bin2[MAX_FINGERPRINT_LEN]; char fingerprint_bin2[MAX_FINGERPRINT_LEN];
size_t fingerprint_bin2_len = sizeof (fingerprint_bin2); size_t fingerprint_bin2_len = sizeof (fingerprint_bin2);
@ -2208,6 +2208,9 @@ check_user_ids (strlist_t *sp,
if (!opt.quiet) if (!opt.quiet)
log_info (_("(check argument of option '%s')\n"), option); log_info (_("(check argument of option '%s')\n"), option);
if (! rc)
rc = GPG_ERR_CONFLICT;
err = keydb_get_keyblock (hd, &kb); err = keydb_get_keyblock (hd, &kb);
if (err) if (err)
log_error (_("error reading key block for '%s': %s.\n"), log_error (_("error reading key block for '%s': %s.\n"),
@ -2225,6 +2228,15 @@ check_user_ids (strlist_t *sp,
release_kbnode (kb); release_kbnode (kb);
} }
} }
else if (! (gpg_err_code (err) == GPG_ERR_NOT_FOUND
|| gpg_err_code (err) == GPG_ERR_EOF))
/* An error (other than "not found"). */
{
log_error (_("Error reading from keyring: %s\n"),
gpg_strerror (err));
if (! rc)
rc = err;
}
} }
strlist_rev (&s2); strlist_rev (&s2);