security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

gpg: Make --output work with --verify.

Browse Source 
* g10/mainproc.c (proc_plaintext): Handle opt.output.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-09-08 00:45:45 +02:00
parent 6308c30019
commit bbe940c095
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/gpg.texi
View File

@ -3438,13 +3438,15 @@ show fingerprint
@item gpg --verify @code{pgpfile} @item gpg --verify @code{pgpfile}
@itemx gpg --verify @code{sigfile} @itemx gpg --verify @code{sigfile}
Verify the signature of the file but do not output the data. The Verify the signature of the file but do not output the data unless
second form is used for detached signatures, where @code{sigfile} requested. The second form is used for detached signatures, where
is the detached signature (either ASCII armored or binary) and @code{sigfile} is the detached signature (either ASCII armored or
are the signed data; if this is not given, the name of binary) and are the signed data; if this is not given, the name of the
the file holding the signed data is constructed by cutting off the file holding the signed data is constructed by cutting off the
extension (".asc" or ".sig") of @code{sigfile} or by asking the extension (".asc" or ".sig") of @code{sigfile} or by asking the user
user for the filename. for the filename. If the option @option{--output} is also used the
signed data is written to the file specified by that option; use
@code{-} to write the signed data to stdout.
@end table @end table

7
g10/mainproc.c
View File

@ -757,7 +757,12 @@ proc_plaintext( CTX c, PACKET *pkt )
if (!rc) if (!rc)
{ {
rc = handle_plaintext (pt, &c->mfx, c->sigs_only, clearsig); /* It we are in --verify mode, we do not want to output the
* signed text. However, if --output is also used we do what
* has been requested and write out the signed data. */
rc = handle_plaintext (pt, &c->mfx,
(opt.outfp || opt.outfile)? 0 : c->sigs_only,
clearsig);
if (gpg_err_code (rc) == GPG_ERR_EACCES && !c->sigs_only) if (gpg_err_code (rc) == GPG_ERR_EACCES && !c->sigs_only)
{ {
/* Can't write output but we hash it anyway to check the /* Can't write output but we hash it anyway to check the