mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
gpg: Fix using --decrypt along with --use-embedded-filename.
* g10/options.h (opt): Add flags.dummy_outfile. * g10/decrypt.c (decrypt_message): Set this global flag instead of the fucntion local flag. * g10/plaintext.c (get_output_file): Ignore opt.output if that was used as a dummy option aslong with --use-embedded-filename. -- The problem here was that an explicit specified --decrypt, as meanwhile suggested, did not work with that dangerous --use-embedded-filename. In contrast it worked when gpg decrypted as a side-effect of parsing the data. GnuPG-bug-id: 4500 Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
7e5847da0f
commit
386bacd974
4 changed files with 10 additions and 5 deletions
|
@ -70,7 +70,8 @@ get_output_file (const byte *embedded_name, int embedded_namelen,
|
|||
goto leave;
|
||||
}
|
||||
}
|
||||
else if (opt.outfile)
|
||||
else if (opt.outfile
|
||||
&& !(opt.flags.use_embedded_filename && opt.flags.dummy_outfile))
|
||||
{
|
||||
fname = xtrystrdup (opt.outfile);
|
||||
if (!fname)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue