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

6
g10/sign.c
View file

@ -889,7 +889,7 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
log_info(_("writing to '%s'\n"), outfile );
}
else if( (rc = open_outfile (-1, fname,
opt.armor? 1: detached? 2:0, 0, &out)))
opt.armor? 1: detached? 2:0, 0, &out, 0)))
goto leave;
/* prepare to calculate the MD over the input */
@ -1191,7 +1191,7 @@ clearsign_file (ctrl_t ctrl,
else if( opt.verbose )
log_info(_("writing to '%s'\n"), outfile );
}
else if ((rc = open_outfile (-1, fname, 1, 0, &out)))
else if ((rc = open_outfile (-1, fname, 1, 0, &out, 0)))
goto leave;
iobuf_writestr(out, "-----BEGIN PGP SIGNED MESSAGE-----" LF );
@ -1340,7 +1340,7 @@ sign_symencrypt_file (ctrl_t ctrl, const char *fname, strlist_t locusr)
cfx.dek->use_mdc = use_mdc (NULL, cfx.dek->algo);
/* now create the outfile */
rc = open_outfile (-1, fname, opt.armor? 1:0, 0, &out);
rc = open_outfile (-1, fname, opt.armor? 1:0, 0, &out, 0);
if (rc)
goto leave;