mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg: Use gnupg_fd_t for encrypt_crypt and gpg_verify.
* common/iobuf.h (iobuf_fdopen_nc): Use gnupg_t. * common/iobuf.c (iobuf_fdopen_nc): Use gnupg_t. * g10/main.h (encrypt_crypt, gpg_verify): Use gnupg_fd_t. * g10/encrypt.c (encrypt_crypt): Use gnupg_fd_t. (encrypt_crypt_files): Follow the change. * g10/gpg.c (main): Follow the change. * g10/verify.c (gpg_verify): Use gnupg_fd_t. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
68d3a73ea7
commit
2c2516f03a
6 changed files with 22 additions and 17 deletions
|
@ -4408,7 +4408,8 @@ main (int argc, char **argv)
|
|||
{
|
||||
if( argc > 1 )
|
||||
wrong_args("--encrypt [filename]");
|
||||
if( (rc = encrypt_crypt (ctrl, -1, fname, remusr, 0, NULL, -1)) )
|
||||
if ((rc = encrypt_crypt (ctrl, GNUPG_INVALID_FD, fname, remusr,
|
||||
0, NULL, GNUPG_INVALID_FD)))
|
||||
{
|
||||
write_status_failure ("encrypt", rc);
|
||||
log_error("%s: encryption failed: %s\n",
|
||||
|
@ -4433,7 +4434,8 @@ main (int argc, char **argv)
|
|||
gnupg_compliance_option_string (opt.compliance));
|
||||
else
|
||||
{
|
||||
if( (rc = encrypt_crypt (ctrl, -1, fname, remusr, 1, NULL, -1)) )
|
||||
if ((rc = encrypt_crypt (ctrl, GNUPG_INVALID_FD, fname, remusr,
|
||||
1, NULL, GNUPG_INVALID_FD)))
|
||||
{
|
||||
write_status_failure ("encrypt", rc);
|
||||
log_error ("%s: encryption failed: %s\n",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue