security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

g10: Always save standard revocation certificate in file.

Browse source 
* 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
This commit is contained in:
Marcus Brinkmann 2017-08-01 17:41:03 +02:00
parent a8d0b8d233
commit ebc65ff459
7 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
g10/openfile.c
View file

@ -174,13 +174,15 @@ ask_outfile_name( const char *name, size_t namelen )
* If INP_FD is not -1 the function simply creates an IOBUF for that
* file descriptor and ignore INAME and MODE. Note that INP_FD won't
* be closed if the returned IOBUF is closed. With RESTRICTEDPERM a
* file will be created with mode 700 if possible.
* file will be created with mode 700 if possible. If NO_OUTFILE is
* true, don't use the outfile option even if it is set.
*/
int
open_outfile (int inp_fd, const char *iname, int mode, int restrictedperm,
iobuf_t *a)
iobuf_t *a, int no_outfile)
{
int rc = 0;
const char outfile = no_outfile ? NULL : opt.outfile;
*a = NULL;
if (inp_fd != -1)
@ -200,7 +202,7 @@ open_outfile (int inp_fd, const char *iname, int mode, int restrictedperm,
log_info (_("writing to '%s'\n"), xname);
}
}
else if (iobuf_is_pipe_filename (iname) && !opt.outfile)
else if (iobuf_is_pipe_filename (iname) && !outfile)
{
*a = iobuf_create (NULL, 0);
if ( !*a )
@ -218,8 +220,8 @@ open_outfile (int inp_fd, const char *iname, int mode, int restrictedperm,
if (opt.dry_run)
name = NAME_OF_DEV_NULL;
else if (opt.outfile)
name = opt.outfile;
else if (outfile)
name = outfile;
else
{
#ifdef USE_ONLY_8DOT3