diff options
| author | Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de> | 2017-08-01 17:41:03 +0200 |
|---|---|---|
| committer | Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de> | 2017-08-01 17:41:03 +0200 |
| commit | ebc65ff459e6c228fb7406e375819a9fe5637abe (patch) | |
| tree | b5db1cf2eae3cbc5b9be17ac37696aa97be2aa7d /g10/revoke.c | |
| parent | artwork: Add icons. (diff) | |
| download | gnupg2-ebc65ff459e6c228fb7406e375819a9fe5637abe.tar.xz gnupg2-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 <mb@g10code.com>
GnuPG-bug-id: 3015
Diffstat (limited to 'g10/revoke.c')
| -rw-r--r-- | g10/revoke.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/revoke.c b/g10/revoke.c index 1dea6ae12..db3c49562 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -334,7 +334,7 @@ gen_desig_revoke (ctrl_t ctrl, const char *uname, strlist_t locusr) if( !opt.armor ) tty_printf(_("ASCII armored output forced.\n")); - if( (rc = open_outfile (-1, NULL, 0, 1, &out )) ) + if( (rc = open_outfile (-1, NULL, 0, 1, &out, 0 )) ) goto leave; afx->what = 1; @@ -461,7 +461,7 @@ create_revocation (ctrl_t ctrl, afx = new_armor_context (); - if ((rc = open_outfile (-1, filename, suffix, 1, &out))) + if ((rc = open_outfile (-1, filename, suffix, 1, &out, !!filename))) goto leave; if (leadintext ) |