From 17c7de32c38172baf1435a22be87532950f4573d Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 21 May 2004 19:15:06 +0000 Subject: [PATCH] 2004-05-21 Marcus Brinkmann * verify.c (parse_error): Do not skip location of where token. --- gpgme/ChangeLog | 2 ++ gpgme/verify.c | 9 ++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 3be03a7a..4ac748c2 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,7 @@ 2004-05-21 Marcus Brinkmann + * verify.c (parse_error): Do not skip location of where token. + * gpgme.h (gpgme_status_code_t): Add GPGME_STATUS_REVKEYSIG. * verify.c (_gpgme_verify_status_handler): Add handling of GPGME_STATUS_REVKEYSIG. diff --git a/gpgme/verify.c b/gpgme/verify.c index 7ac5fe2b..e1563302 100644 --- a/gpgme/verify.c +++ b/gpgme/verify.c @@ -488,16 +488,11 @@ parse_error (gpgme_signature_t sig, char *args) else return gpg_error (GPG_ERR_INV_ENGINE); - /* It is often useful to compare only the last part of the where token. */ - where_last = strrchr (where, '.'); - if (!where_last) - where_last = where; - err = _gpgme_map_gnupg_error (which); - if (!strcmp (where_last, ".findkey")) + if (!strcmp (where, "verify.findkey")) sig->status = err; - else if (!strcmp (where_last, ".keyusage") + else if (!strcmp (where, "verify.keyusage") && gpg_err_code (err) == GPG_ERR_WRONG_KEY_USAGE) sig->wrong_key_usage = 1;