mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg: Move the check by is_secured_file earlier.
* g10/decrypt.c (decrypt_message_fd): Call is_secured_file here.
* g10/plaintext.c (get_output_file): Remove the call.
--
Fixes-commit: 71625f56fd
GnuPG-bug-id: 6580
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
16d135c396
commit
067bc2ed4c
2 changed files with 13 additions and 7 deletions
|
@ -139,6 +139,18 @@ decrypt_message_fd (ctrl_t ctrl, gnupg_fd_t input_fd,
|
|||
return err;
|
||||
}
|
||||
|
||||
if (is_secured_file (output_fd))
|
||||
{
|
||||
char xname[64];
|
||||
|
||||
err = gpg_error (GPG_ERR_EPERM);
|
||||
snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)output_fd);
|
||||
log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (err));
|
||||
iobuf_close (fp);
|
||||
release_progress_context (pfx);
|
||||
return err;
|
||||
}
|
||||
|
||||
opt.outfp = open_stream_nc (output_fd, "w");
|
||||
if (!opt.outfp)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue