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

* verify.c (_gpgme_verify_status_handler): Ignore the error status

Browse Source 
if we can't process it.
* decrypt-verify.c (decrypt_verify_status_handler): Backed out
yesterday's hack.  It is not any longer required.
This commit is contained in:
Werner Koch 2004-04-08 09:53:01 +00:00
parent 90837eb14e
commit 162ebc3b04
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gpgme/ChangeLog
View File

@ -1,3 +1,10 @@
2004-04-08 Werner Koch <wk@gnupg.org>
* verify.c (_gpgme_verify_status_handler): Ignore the error status
if we can't process it.
* decrypt-verify.c (decrypt_verify_status_handler): Backed out
yesterday's hack. It is not any longer required.
2004-04-07 Werner Koch <wk@gnupg.org> 2004-04-07 Werner Koch <wk@gnupg.org>
* decrypt-verify.c (decrypt_verify_status_handler): Hack to cope * decrypt-verify.c (decrypt_verify_status_handler): Hack to cope

9
gpgme/decrypt-verify.c
View File

@ -36,16 +36,7 @@ decrypt_verify_status_handler (void *priv, gpgme_status_code_t code,
if (!err) if (!err)
err = _gpgme_decrypt_status_handler (priv, code, args); err = _gpgme_decrypt_status_handler (priv, code, args);
if (!err) if (!err)
{
err = _gpgme_verify_status_handler (priv, code, args); err = _gpgme_verify_status_handler (priv, code, args);
/* The verify status handler might not be in the state to verify
a signature, either because there is no signature or we are
currently processing the encrytion layer, and thus it will
likely return "invalid engine" - we have to ignore it
therefore. */
if (gpg_err_code (err) == GPG_ERR_INV_ENGINE)
err = 0;
}
return err; return err;
} }

3
gpgme/decrypt.c
View File

@ -104,6 +104,9 @@ _gpgme_decrypt_status_handler (void *priv, gpgme_status_code_t code,
break; break;
case GPGME_STATUS_ERROR: case GPGME_STATUS_ERROR:
/* Note that this is an informational status code which should
not lead to an erro retunr unless it is something not related
to the backend. */
{ {
const char d_alg[] = "decrypt.algorithm"; const char d_alg[] = "decrypt.algorithm";
const char u_alg[] = "Unsupported_Algorithm"; const char u_alg[] = "Unsupported_Algorithm";

2
gpgme/gpgme.h
View File

@ -74,7 +74,7 @@ extern "C" {
AM_PATH_GPGME macro) check that this header matches the installed AM_PATH_GPGME macro) check that this header matches the installed
library. Warning: Do not edit the next line. configure will do library. Warning: Do not edit the next line. configure will do
that for you! */ that for you! */
#define GPGME_VERSION "0.4.6" #define GPGME_VERSION "0.4.7-cvs"
/* Some opaque data types used by GPGME. */ /* Some opaque data types used by GPGME. */

6
gpgme/verify.c
View File

@ -1,6 +1,6 @@
/* verify.c - Signature verification. /* verify.c - Signature verification.
Copyright (C) 2000 Werner Koch (dd9jn) Copyright (C) 2000 Werner Koch (dd9jn)
Copyright (C) 2001, 2002, 2003 g10 Code GmbH Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
This file is part of GPGME. This file is part of GPGME.
@ -550,7 +550,9 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
: gpg_error (GPG_ERR_INV_ENGINE); : gpg_error (GPG_ERR_INV_ENGINE);
case GPGME_STATUS_ERROR: case GPGME_STATUS_ERROR:
return sig ? parse_error (sig, args) : gpg_error (GPG_ERR_INV_ENGINE); /* The error status is informational, so we don't return an
error code if we are not ready to process this status. */
return sig ? parse_error (sig, args) : 0;
case GPGME_STATUS_EOF: case GPGME_STATUS_EOF:
if (sig && !opd->did_prepare_new_sig) if (sig && !opd->did_prepare_new_sig)