From ebc65ff459e6c228fb7406e375819a9fe5637abe Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 1 Aug 2017 17:41:03 +0200 Subject: 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 GnuPG-bug-id: 3015 --- g10/revoke.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'g10/revoke.c') 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 ) -- cgit v1.2.3