From b6e5bb310ee28ed3a8066968083b1767ab913ec7 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 24 Dec 2002 13:08:56 +0000 Subject: doc/ 2002-12-24 Marcus Brinkmann * gpgme.texi (Verify): Drop R_STAT argument in gpgme_op_verify. * gpgme.texi (Decrypt and Verify): Likewise for gpgme_op_decrypt_verify. gpgme/ 2002-12-24 Marcus Brinkmann * gpgme.h (gpgme_op_verify, gpgme_op_decrypt_verify): Drop R_STAT argument. * decrypt-verify.c (gpgme_op_decrypt_verify): Drop R_STAT argument. * verify.c (gpgme_op_verify): Drop R_STAT argument. (_gpgme_intersect_stati): Function removed. * ops.h (_gpgme_intersect_stati): Remove prototype. tests/ 2002-12-24 Marcus Brinkmann * gpgsm/t-verify.c (main): Adjust caller of gpgme_op_verify. * gpg/t-verify.c (main): Likewise. * gpg/t-decrypt-verify.c (main): Likewise for gpgme_op_decrypt_verify. --- doc/ChangeLog | 6 ++++++ doc/gpgme.texi | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 39a54aaf..8a652714 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2002-12-24 Marcus Brinkmann + + * gpgme.texi (Verify): Drop R_STAT argument in gpgme_op_verify. + * gpgme.texi (Decrypt and Verify): Likewise for + gpgme_op_decrypt_verify. + 2002-12-23 Marcus Brinkmann * gpgme.texi (Information About Keys): Document that diff --git a/doc/gpgme.texi b/doc/gpgme.texi index a74ec240..d3c02be8 100644 --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -2466,7 +2466,7 @@ have a different status. You can get each key's status with @end deftp -@deftypefun GpgmeError gpgme_op_verify (@w{GpgmeCtx @var{ctx}}, @w{GpgmeData @var{sig}}, @w{GpgmeData @var{signed_text}}, @w{GpgmeData @var{plain}}, @w{GpgmeSigStat *@var{r_stat}}) +@deftypefun GpgmeError gpgme_op_verify (@w{GpgmeCtx @var{ctx}}, @w{GpgmeData @var{sig}}, @w{GpgmeData @var{signed_text}}, @w{GpgmeData @var{plain}}) The function @code{gpgme_op_verify} verifies that the signature in the data object @var{sig} is a valid signature. If @var{sig} is a detached signature, then the signed text should be provided in @@ -2476,7 +2476,6 @@ Otherwise, if @var{sig} is a normal (or cleartext) signature, writable data object that will contain the plaintext after successful verification. -The combined status of all signatures is returned in @var{r_stat}. The results of the individual signature verifications can be retrieved with @code{gpgme_get_sig_status} and @code{gpgme_get_sig_key}. @@ -2658,11 +2657,11 @@ The function returns a string if the notation data is available or @cindex signature check @cindex cryptographic operation, decryption and verification -@deftypefun GpgmeError gpgme_op_decrypt_verify (@w{GpgmeCtx @var{ctx}}, @w{GpgmeData @var{cipher}}, @w{GpgmeData @var{plain}}, @w{GpgmeSigStat *@var{r_stat}}) +@deftypefun GpgmeError gpgme_op_decrypt_verify (@w{GpgmeCtx @var{ctx}}, @w{GpgmeData @var{cipher}}, @w{GpgmeData @var{plain}}) The function @code{gpgme_op_decrypt_verify} decrypts the ciphertext in the data object @var{cipher} and stores it into the data object @var{plain}. If @var{cipher} contains signatures, they will be -verified and their combined status will be returned in @var{r_stat}. +verified. After the operation completed, @code{gpgme_op_get_sig_status} and @code{gpgme_op_get_sig_key} can be used to retrieve more information -- cgit v1.2.3