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/dearmor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'g10/dearmor.c') diff --git a/g10/dearmor.c b/g10/dearmor.c index 92239ccfd..839227a5b 100644 --- a/g10/dearmor.c +++ b/g10/dearmor.c @@ -63,7 +63,7 @@ dearmor_file( const char *fname ) push_armor_filter ( afx, inp ); - if( (rc = open_outfile (-1, fname, 0, 0, &out)) ) + if( (rc = open_outfile (-1, fname, 0, 0, &out, 0)) ) goto leave; while( (c = iobuf_get(inp)) != -1 ) @@ -109,7 +109,7 @@ enarmor_file( const char *fname ) } - if( (rc = open_outfile (-1, fname, 1, 0, &out )) ) + if( (rc = open_outfile (-1, fname, 1, 0, &out, 0 )) ) goto leave; afx->what = 4; -- cgit v1.2.3