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/dearmor.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/dearmor.c')
| -rw-r--r-- | g10/dearmor.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |