security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

w32: Fix use of assuan_sendfd.

Browse Source 
* kbx/kbx-client-util.c (prepare_data_pipe): Use _get_osfhandle
for pipe to be used for sentfd.
[HAVE_W32_SYSTEM] (datastream_thread): Add the case of NREAD==0.
* tools/gpg-connect-agent.c (do_sendfd): Use es_syshd instead
of es_fileno.
[HAVE_W32_SYSTEM] (do_open): Use %p for formating HANDLE.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-06-01 09:10:14 +09:00
parent 6ed61d98a0
commit 0fba0bbc62
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kbx/kbx-client-util.c
View File

@ -118,10 +118,14 @@ prepare_data_pipe (kbx_client_data_t kcd)
return err; /* That should not happen. */ return err; /* That should not happen. */
} }
err = assuan_sendfd (kcd->ctx, INT2FD (inpipe[1])); #ifdef HAVE_W32_SYSTEM
err = assuan_sendfd (kcd->ctx, INT2FD (_get_osfhandle (inpipe[1])));
#else
err = assuan_sendfd (kcd->ctx, inpipe[1]);
#endif
if (err) if (err)
{ {
log_error ("sending sending fd %d to keyboxd: %s <%s>\n", log_error ("sending fd %d to keyboxd: %s <%s>\n",
inpipe[1], gpg_strerror (err), gpg_strsource (err)); inpipe[1], gpg_strerror (err), gpg_strsource (err));
es_fclose (infp); es_fclose (infp);
gnupg_close_pipe (inpipe[1]); gnupg_close_pipe (inpipe[1]);
@ -193,6 +197,13 @@ datastream_thread (void *arg)
gnupg_sleep (1); gnupg_sleep (1);
continue; continue;
} }
#ifdef HAVE_W32_SYSTEM
if (nread == 0)
{
gnupg_sleep (1);
continue;
}
#endif
if (nread != 4) if (nread != 4)
{ {
err = gpg_error (GPG_ERR_EIO); err = gpg_error (GPG_ERR_EIO);

55
tools/gpg-connect-agent.c
View File

@ -898,8 +898,10 @@ static void
do_sendfd (assuan_context_t ctx, char *line) do_sendfd (assuan_context_t ctx, char *line)
{ {
estream_t fp; estream_t fp;
char *name, *mode, *p; char *name, *p;
int rc, fd; int rc;
char mode[32];
es_syshd_t hd;
/* Get file name. */ /* Get file name. */
name = line; name = line;
@ -911,17 +913,25 @@ do_sendfd (assuan_context_t ctx, char *line)
p++; p++;
/* Get mode. */ /* Get mode. */
mode = p; if (!*p)
if (!*mode) {
mode = "r"; mode[0] = 'r';
mode[1] = 0;
p = &mode[1];
}
else else
{ {
for (p=mode; *p && !spacep (p); p++) int i;
; for (i = 0; *p && !spacep (p); p++)
if (*p) mode[i++] = *p;
*p++ = 0; mode[i] = 0;
p = &mode[i];
} }
#ifdef HAVE_W32_SYSTEM
strcpy (p, ",sysopen");
#endif
/* Open and send. */ /* Open and send. */
fp = es_fopen (name, mode); fp = es_fopen (name, mode);
if (!fp) if (!fp)
@ -930,15 +940,30 @@ do_sendfd (assuan_context_t ctx, char *line)
name, mode, strerror (errno)); name, mode, strerror (errno));
return; return;
} }
fd = es_fileno (fp);
es_syshd (fp, &hd);
#ifdef HAVE_W32_SYSTEM
if (opt.verbose)
log_error ("file '%s' opened in \"%s\" mode, fd=%p\n",
name, mode, hd.u.handle);
#else
if (opt.verbose) if (opt.verbose)
log_error ("file '%s' opened in \"%s\" mode, fd=%d\n", log_error ("file '%s' opened in \"%s\" mode, fd=%d\n",
name, mode, fd); name, mode, hd.u.fd);
#endif
rc = assuan_sendfd (ctx, INT2FD (fd) ); #ifdef HAVE_W32_SYSTEM
rc = assuan_sendfd (ctx, hd.u.handle);
if (rc) if (rc)
log_error ("sending descriptor %d failed: %s\n", fd, gpg_strerror (rc)); log_error ("sending descriptor %p failed: %s\n", hd.u.handle,
gpg_strerror (rc));
#else
rc = assuan_sendfd (ctx, hd.u.fd);
if (rc)
log_error ("sending descriptor %d failed: %s\n", hd.u.fd,
gpg_strerror (rc));
#endif
es_fclose (fp); es_fclose (fp);
} }
@ -1037,8 +1062,8 @@ do_open (char *line)
open_fd_table[fd].handle = newhandle; open_fd_table[fd].handle = newhandle;
} }
if (opt.verbose) if (opt.verbose)
log_info ("file '%s' opened in \"%s\" mode, fd=%d (libc=%d)\n", log_info ("file '%s' opened in \"%s\" mode, fd=%p (libc=%d)\n",
name, mode, (int)open_fd_table[fd].handle, fd); name, mode, open_fd_table[fd].handle, fd);
set_int_var (varname, (int)open_fd_table[fd].handle); set_int_var (varname, (int)open_fd_table[fd].handle);
#else /* Unix */ #else /* Unix */
if (opt.verbose) if (opt.verbose)