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

common,kbx,tests: Clean up the PIPE function API.

Browse source 
* common/call-gpg.c (_gpg_encrypt, _gpg_decrypt): Simply, use
gnupg_create_pipe.
* tests/gpgscm/ffi.c (do_inbound_pipe): Likewise.
* common/exechelp.h (gnupg_create_inbound_pipe): Use gnupg_fd_t
for native pipe descriptor and don't expose other end of pipe.
(gnupg_create_outbound_pipe): Ditto.
* common/exechelp-posix.c (create_pipe_and_estream): Clean up.
(gnupg_create_inbound_pipe): Fail if R_FD or R_FP is NULL.
(gnupg_create_outbound_pipe: Ditto.
* common/exechelp-w32.c (create_pipe_and_estream): Clean up.
(gnupg_create_inbound_pipe): Fail if R_FD or R_FP is NULL.
(gnupg_create_outbound_pipe: Ditto.
(gnupg_create_pipe): Move the code from original
create_pipe_and_estream to call _open_osfhandle.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change of
API.
* kbx/kbx-client-util.c (prepare_data_pipe): Likewise.

--

GnuPG-bug-id: 7194
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-07-09 10:29:44 +09:00
parent 953dd67368
commit af6c47b291
No known key found for this signature in database
GPG key ID: 640114AF89DE6054
7 changed files with 144 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

30
kbx/kbx-client-util.c
View file

@ -30,6 +30,7 @@
#include "../common/membuf.h"
#include "../common/i18n.h"
#include "../common/asshelp.h"
#include "../common/sysutils.h"
#include "../common/exechelp.h"
#include "../common/sysutils.h"
#include "../common/host2net.h"
@ -102,7 +103,7 @@ prepare_data_pipe (kbx_client_data_t kcd)
{
gpg_error_t err;
int rc;
int inpipe[2];
gnupg_fd_t inpipe;
estream_t infp;
npth_attr_t tattr;
@ -111,24 +112,29 @@ prepare_data_pipe (kbx_client_data_t kcd)
kcd->datalen = 0;
kcd->dataerr = 0;
err = gnupg_create_inbound_pipe (inpipe, &infp, 0);
err = gnupg_create_inbound_pipe (&inpipe, &infp, 0);
if (err)
{
log_error ("error creating inbound pipe: %s\n", gpg_strerror (err));
return err; /* That should not happen. */
}
#ifdef HAVE_W32_SYSTEM
err = assuan_sendfd (kcd->ctx, (HANDLE)_get_osfhandle (inpipe[1]));
#else
err = assuan_sendfd (kcd->ctx, inpipe[1]);
#endif
err = assuan_sendfd (kcd->ctx, inpipe);
if (err)
{
#ifdef HAVE_W32_SYSTEM
log_error ("sending fd %p to keyboxd: %s <%s>\n",
inpipe, gpg_strerror (err), gpg_strsource (err));
#else
log_error ("sending fd %d to keyboxd: %s <%s>\n",
inpipe[1], gpg_strerror (err), gpg_strsource (err));
inpipe, gpg_strerror (err), gpg_strsource (err));
#endif
es_fclose (infp);
gnupg_close_pipe (inpipe[1]);
#ifdef HAVE_W32_SYSTEM
CloseHandle (inpipe);
#else
close (inpipe);
#endif
return err;
}
@ -142,7 +148,11 @@ prepare_data_pipe (kbx_client_data_t kcd)
return err;
}
close (inpipe[1]);
#ifdef HAVE_W32_SYSTEM
CloseHandle (inpipe);
#else
close (inpipe);
#endif
kcd->fp = infp;
rc = npth_attr_init (&tattr);