GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Minor cleanup of commit 195c735

Browse Source 
* src/verify.c (parse_tofu_user): For cleanness use gpg_error ...
(_gpgme_verify_status_handler): ... and gpg_err_code.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-02-03 13:08:39 +01:00
parent 43160a39f2
commit afc308598d
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/verify.c
View File

@ -685,7 +685,7 @@ parse_tofu_user (gpgme_signature_t sig, char *args, gpgme_protocol_t protocol)
{ {
/* GnuPG since 2.1.17 emits multiple TOFU_USER lines with /* GnuPG since 2.1.17 emits multiple TOFU_USER lines with
different fingerprints in case of conflicts for a signature. */ different fingerprints in case of conflicts for a signature. */
err = GPG_ERR_DUP_VALUE; err = gpg_error (GPG_ERR_DUP_VALUE);
goto leave; goto leave;
} }
@ -1003,13 +1003,13 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
return trace_gpg_error (GPG_ERR_INV_ENGINE); return trace_gpg_error (GPG_ERR_INV_ENGINE);
err = parse_tofu_user (sig, args, ctx->protocol); err = parse_tofu_user (sig, args, ctx->protocol);
/* gpg emits TOFU User lines for each conflicting key. /* gpg emits TOFU User lines for each conflicting key.
GPGME does not expose this to have a clean API and * GPGME does not expose this to have a clean API and
a GPGME user can do a keylisting with the address * a GPGME user can do a keylisting with the address
normalisation. * normalisation.
So when a duplicated TOFU_USER line is encountered * So when a duplicated TOFU_USER line is encountered
we ignore the conflicting tofu stats emited afterwards. * we ignore the conflicting tofu stats emited afterwards.
*/ */
if (err == GPG_ERR_DUP_VALUE) if (gpg_err_code (err) == GPG_ERR_DUP_VALUE)
{ {
opd->conflict_user_seen = 1; opd->conflict_user_seen = 1;
break; break;