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/encrypt.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/encrypt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index c68d6d5d1..64952800b 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -276,7 +276,7 @@ encrypt_simple (const char *filename, int mode, int use_seskey) do_compress = 0; } - if ( rc || (rc = open_outfile (-1, filename, opt.armor? 1:0, 0, &out ))) + if ( rc || (rc = open_outfile (-1, filename, opt.armor? 1:0, 0, &out, 0 ))) { iobuf_cancel (inp); xfree (cfx.dek); @@ -574,7 +574,7 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename, if (opt.textmode) iobuf_push_filter (inp, text_filter, &tfx); - rc = open_outfile (outputfd, filename, opt.armor? 1:0, 0, &out); + rc = open_outfile (outputfd, filename, opt.armor? 1:0, 0, &out, 0); if (rc) goto leave; |