diff options
author | Marcus Brinkmann <[email protected]> | 2017-08-01 15:41:03 +0000 |
---|---|---|
committer | Marcus Brinkmann <[email protected]> | 2017-08-01 15:41:03 +0000 |
commit | ebc65ff459e6c228fb7406e375819a9fe5637abe (patch) | |
tree | b5db1cf2eae3cbc5b9be17ac37696aa97be2aa7d /g10/sign.c | |
parent | artwork: Add icons. (diff) | |
download | gnupg-ebc65ff459e6c228fb7406e375819a9fe5637abe.tar.gz gnupg-ebc65ff459e6c228fb7406e375819a9fe5637abe.zip |
g10: Always save standard revocation certificate in file.
* g10/main.h (open_outfile): New parameter NO_OUTFILE.
* g10/openfile.c (open_outfile): New parameter NO_OUTFILE. If given,
never use opt.outfile.
* g10/revoke.c (create_revocation): If FILENAME is true, also set
NO_OUTFILE to true (for standard revocation certificates).
* g10/dearmor.c, g10/encrypt.c, g10/export.c, g10/revoke.c,
g10/sign.c: Adjust all other callers.
Signed-off-by: Marcus Brinkmann <[email protected]>
GnuPG-bug-id: 3015
Diffstat (limited to '')
-rw-r--r-- | g10/sign.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/sign.c b/g10/sign.c index 4cf0cd39a..0e379bcc2 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -889,7 +889,7 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr, log_info(_("writing to '%s'\n"), outfile ); } else if( (rc = open_outfile (-1, fname, - opt.armor? 1: detached? 2:0, 0, &out))) + opt.armor? 1: detached? 2:0, 0, &out, 0))) goto leave; /* prepare to calculate the MD over the input */ @@ -1191,7 +1191,7 @@ clearsign_file (ctrl_t ctrl, else if( opt.verbose ) log_info(_("writing to '%s'\n"), outfile ); } - else if ((rc = open_outfile (-1, fname, 1, 0, &out))) + else if ((rc = open_outfile (-1, fname, 1, 0, &out, 0))) goto leave; iobuf_writestr(out, "-----BEGIN PGP SIGNED MESSAGE-----" LF ); @@ -1340,7 +1340,7 @@ sign_symencrypt_file (ctrl_t ctrl, const char *fname, strlist_t locusr) cfx.dek->use_mdc = use_mdc (NULL, cfx.dek->algo); /* now create the outfile */ - rc = open_outfile (-1, fname, opt.armor? 1:0, 0, &out); + rc = open_outfile (-1, fname, opt.armor? 1:0, 0, &out, 0); if (rc) goto leave; |