2005-08-19 16:34:42 +00:00
|
|
|
/* assuan-socket.c
|
2006-09-19 14:01:54 +00:00
|
|
|
* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
2005-08-19 16:34:42 +00:00
|
|
|
*
|
2006-09-19 14:01:54 +00:00
|
|
|
* This file is part of Assuan.
|
2005-08-19 16:34:42 +00:00
|
|
|
*
|
2006-09-19 14:01:54 +00:00
|
|
|
* Assuan is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU Lesser General Public License as
|
|
|
|
* published by the Free Software Foundation; either version 2.1 of
|
|
|
|
* the License, or (at your option) any later version.
|
2005-08-19 16:34:42 +00:00
|
|
|
*
|
2006-09-19 14:01:54 +00:00
|
|
|
* Assuan is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
2005-08-19 16:34:42 +00:00
|
|
|
*
|
2006-09-19 14:01:54 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
2009-03-06 22:29:49 +00:00
|
|
|
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2005-08-19 16:34:42 +00:00
|
|
|
*/
|
2006-09-19 14:01:54 +00:00
|
|
|
|
2005-08-19 16:34:42 +00:00
|
|
|
#include <config.h>
|
|
|
|
#include <stdio.h>
|
2009-03-06 22:29:49 +00:00
|
|
|
#include <stdlib.h>
|
2005-08-19 16:34:42 +00:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2009-03-06 22:29:49 +00:00
|
|
|
#define WIN32_LEAN_AND_MEAN
|
2005-08-19 16:34:42 +00:00
|
|
|
#include <windows.h>
|
2009-03-06 22:29:49 +00:00
|
|
|
#include <wincrypt.h>
|
2005-08-19 16:34:42 +00:00
|
|
|
#include <io.h>
|
|
|
|
#else
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#endif
|
2009-03-06 22:29:49 +00:00
|
|
|
#include <errno.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
2005-08-19 16:34:42 +00:00
|
|
|
#include "assuan-defs.h"
|
|
|
|
|
2006-09-19 14:01:54 +00:00
|
|
|
/* Hacks for Slowaris. */
|
|
|
|
#ifndef PF_LOCAL
|
|
|
|
# ifdef PF_UNIX
|
|
|
|
# define PF_LOCAL PF_UNIX
|
|
|
|
# else
|
|
|
|
# define PF_LOCAL AF_UNIX
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
#ifndef AF_LOCAL
|
|
|
|
# define AF_LOCAL AF_UNIX
|
|
|
|
#endif
|
|
|
|
|
2009-03-06 22:29:49 +00:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
#ifndef S_IRGRP
|
|
|
|
# define S_IRGRP 0
|
|
|
|
# define S_IWGRP 0
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
int
|
|
|
|
_assuan_sock_wsa2errno (int err)
|
|
|
|
{
|
|
|
|
switch (err)
|
|
|
|
{
|
|
|
|
case WSAENOTSOCK:
|
|
|
|
return EINVAL;
|
|
|
|
case WSAEWOULDBLOCK:
|
|
|
|
return EAGAIN;
|
|
|
|
case ERROR_BROKEN_PIPE:
|
|
|
|
return EPIPE;
|
|
|
|
case WSANOTINITIALISED:
|
|
|
|
return ENOSYS;
|
|
|
|
default:
|
|
|
|
return EIO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* W32: Fill BUFFER with LENGTH bytes of random. Returns -1 on
|
|
|
|
failure, 0 on success. Sets errno on failure. */
|
|
|
|
static int
|
|
|
|
get_nonce (char *buffer, size_t nbytes)
|
|
|
|
{
|
|
|
|
HCRYPTPROV prov;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (!CryptAcquireContext (&prov, NULL, NULL, PROV_RSA_FULL,
|
|
|
|
(CRYPT_VERIFYCONTEXT|CRYPT_SILENT)) )
|
|
|
|
errno = ENODEV;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!CryptGenRandom (prov, nbytes, buffer))
|
|
|
|
errno = ENODEV;
|
|
|
|
else
|
|
|
|
ret = 0;
|
|
|
|
CryptReleaseContext (prov, 0);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* W32: The buffer for NONCE needs to be at least 16 bytes. Returns 0 on
|
|
|
|
success and sets errno on failure. */
|
|
|
|
static int
|
|
|
|
read_port_and_nonce (const char *fname, unsigned short *port, char *nonce)
|
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
char buffer[50], *p;
|
|
|
|
size_t nread;
|
|
|
|
int aval;
|
|
|
|
|
|
|
|
fp = fopen (fname, "rb");
|
|
|
|
if (!fp)
|
|
|
|
return -1;
|
|
|
|
nread = fread (buffer, 1, sizeof buffer - 1, fp);
|
|
|
|
fclose (fp);
|
|
|
|
if (!nread)
|
|
|
|
{
|
|
|
|
errno = ENOFILE;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
buffer[nread] = 0;
|
|
|
|
aval = atoi (buffer);
|
|
|
|
if (aval < 1 || aval > 65535)
|
|
|
|
{
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*port = (unsigned int)aval;
|
|
|
|
for (p=buffer; nread && *p != '\n'; p++, nread--)
|
|
|
|
;
|
|
|
|
if (*p != '\n' || nread != 17)
|
|
|
|
{
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
p++; nread--;
|
|
|
|
memcpy (nonce, p, 16);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /*HAVE_W32_SYSTEM*/
|
|
|
|
|
|
|
|
|
|
|
|
|
2005-08-19 16:34:42 +00:00
|
|
|
int
|
2009-03-06 22:29:49 +00:00
|
|
|
_assuan_close (assuan_fd_t fd)
|
2005-08-19 16:34:42 +00:00
|
|
|
{
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
#ifdef _ASSUAN_CUSTOM_IO
|
|
|
|
return _assuan_custom_close (fd);
|
|
|
|
#else
|
|
|
|
#ifdef (HAVE_W32_SYSTEM)
|
2009-03-06 22:29:49 +00:00
|
|
|
int rc = closesocket (HANDLE2SOCKET(fd));
|
|
|
|
if (rc)
|
|
|
|
errno = _assuan_sock_wsa2errno (WSAGetLastError ());
|
2005-08-19 16:34:42 +00:00
|
|
|
if (rc && WSAGetLastError () == WSAENOTSOCK)
|
2009-03-06 22:29:49 +00:00
|
|
|
{
|
|
|
|
rc = CloseHandle (fd);
|
|
|
|
if (rc)
|
|
|
|
/* FIXME. */
|
|
|
|
errno = EIO;
|
|
|
|
}
|
2005-08-19 16:34:42 +00:00
|
|
|
return rc;
|
2007-07-16 17:26:09 +00:00
|
|
|
#else
|
|
|
|
return close (fd);
|
2005-08-19 16:34:42 +00:00
|
|
|
#endif
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
#endif
|
2005-08-19 16:34:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-03-06 22:29:49 +00:00
|
|
|
/* Return a new socket. Note that under W32 we consider a socket the
|
|
|
|
same as an System Handle; all functions using such a handle know
|
|
|
|
about this dual use and act accordingly. */
|
|
|
|
assuan_fd_t
|
2005-08-19 16:34:42 +00:00
|
|
|
_assuan_sock_new (int domain, int type, int proto)
|
|
|
|
{
|
2009-03-06 22:29:49 +00:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
assuan_fd_t res;
|
2005-08-19 16:34:42 +00:00
|
|
|
if (domain == AF_UNIX || domain == AF_LOCAL)
|
|
|
|
domain = AF_INET;
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
|
|
|
|
#ifdef _ASSUAN_CUSTOM_IO
|
|
|
|
return _assuan_custom_socket (domain, type, proto);
|
|
|
|
#else
|
2009-03-06 22:29:49 +00:00
|
|
|
res = SOCKET2HANDLE(socket (domain, type, proto));
|
|
|
|
if (res == ASSUAN_INVALID_FD)
|
|
|
|
errno = _assuan_sock_wsa2errno (WSAGetLastError ());
|
|
|
|
return res;
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
#ifdef _ASSUAN_CUSTOM_IO
|
|
|
|
return _gpgme_io_socket (domain, type, proto);
|
2009-03-06 22:29:49 +00:00
|
|
|
#else
|
2005-08-19 16:34:42 +00:00
|
|
|
return socket (domain, type, proto);
|
|
|
|
#endif
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
|
|
|
|
#endif
|
2005-08-19 16:34:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int
|
2009-03-06 22:29:49 +00:00
|
|
|
_assuan_sock_connect (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen)
|
2005-08-19 16:34:42 +00:00
|
|
|
{
|
2009-03-06 22:29:49 +00:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX)
|
|
|
|
{
|
|
|
|
struct sockaddr_in myaddr;
|
|
|
|
struct sockaddr_un *unaddr;
|
|
|
|
unsigned short port;
|
|
|
|
char nonce[16];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
unaddr = (struct sockaddr_un *)addr;
|
|
|
|
if (read_port_and_nonce (unaddr->sun_path, &port, nonce))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
myaddr.sin_family = AF_INET;
|
|
|
|
myaddr.sin_port = htons (port);
|
|
|
|
myaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
|
2005-08-19 16:34:42 +00:00
|
|
|
|
2009-03-06 22:29:49 +00:00
|
|
|
/* Set return values. */
|
|
|
|
unaddr->sun_family = myaddr.sin_family;
|
|
|
|
unaddr->sun_port = myaddr.sin_port;
|
|
|
|
unaddr->sun_addr.s_addr = myaddr.sin_addr.s_addr;
|
2005-08-19 16:34:42 +00:00
|
|
|
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
#ifdef _ASSUAN_CUSTOM_IO
|
|
|
|
ret = _assuan_custom_connect (sockfd,
|
|
|
|
(struct sockaddr *)&myaddr, sizeof myaddr);
|
|
|
|
#else
|
2009-03-06 22:29:49 +00:00
|
|
|
ret = connect (HANDLE2SOCKET(sockfd),
|
|
|
|
(struct sockaddr *)&myaddr, sizeof myaddr);
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
#endif
|
|
|
|
|
2009-03-06 22:29:49 +00:00
|
|
|
if (!ret)
|
|
|
|
{
|
|
|
|
/* Send the nonce. */
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
|
2009-03-06 22:29:49 +00:00
|
|
|
ret = _assuan_io_write (sockfd, nonce, 16);
|
|
|
|
if (ret >= 0 && ret != 16)
|
|
|
|
{
|
|
|
|
errno = EIO;
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
}
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
else
|
|
|
|
errno = _assuan_sock_wsa2errno (WSAGetLastError ());
|
2009-03-06 22:29:49 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
res = connect (HANDLE2SOCKET (sockfd), addr, addrlen);
|
|
|
|
if (res < 0)
|
|
|
|
errno = _assuan_sock_wsa2errno (WSAGetLastError ());
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
#else
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
|
|
|
|
#ifdef _ASSUAN_CUSTOM_IO
|
|
|
|
return _assuan_custom_connect (sockfd, addr, addrlen);
|
|
|
|
#else
|
2009-03-06 22:29:49 +00:00
|
|
|
return connect (sockfd, addr, addrlen);
|
2005-08-19 16:34:42 +00:00
|
|
|
#endif
|
assuan/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (_gpgme_io_socket): New prototype.
(_ASSUAN_CUSTOM_IO, _assuan_custom_close, _assuan_custom_read)
(_assuan_custom_write, _assuan_custom_pipe, _assuan_custom_socket)
(_assuan_custom_connect): New macros.
* assuan-socket.c (_assuan_close, _assuan_sock_new)
(_assuan_sock_connect) [_ASSUAN_CUSTOM_IO]: Use custom I/O function.
* assuan-buffer.c (assuan_read_line): Do not handle EAGAIN anymore.
* assuan-client.c (_assuan_read_from_server): Likewise.
* assuan-handler.c (process_next): Likewise
* assuan-inquire.c (assuan_inquire): Likewise.
src/
2009-04-08 Marcus Brinkmann <marcus@g10code.de>
* w32-glib-io.c (giochannel_table): New members used, fd, socket.
(find_channel): Drop CREATE argument.
(new_dummy_channel_from_fd, new_channel_from_fd)
(new_channel_from_socket): New functions.
(_gpgm_io_fd2str): Implement for sockets.
(_gpgme_io_write, _gpgme_io_read): Translate EAGAIN errors
correctly.
(_gpgme_io_pipe): Fix for new channel bookkeeping.
(_gpgme_io_close, _gpgme_io_dup): Likewise.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-io.c (MAX_READERS, MAX_WRITERS): Bump up to 40.
(wsa2errno, _gpgme_io_socket, _gpgme_io_connect): New.
* w32-qt-io.cpp (_gpgme_io_socket, _gpgme_io_connect): New stubs.
* version.c [HAVE_W32_SYSTEM]: Include "windows.h.
(do_subsystem_inits) [HAVE_W32_SYSTEM]: Call WSAStartup.
* engine-assuan.c (llass_status_handler): Ignore EAGAIN errors.
2009-04-08 18:53:57 +00:00
|
|
|
|
|
|
|
#endif
|
2005-08-19 16:34:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int
|
2009-03-06 22:29:49 +00:00
|
|
|
_assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen)
|
2005-08-19 16:34:42 +00:00
|
|
|
{
|
2009-03-06 22:29:49 +00:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2005-08-19 16:34:42 +00:00
|
|
|
if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX)
|
|
|
|
{
|
|
|
|
struct sockaddr_in myaddr;
|
2009-03-06 22:29:49 +00:00
|
|
|
struct sockaddr_un *unaddr;
|
|
|
|
int filefd;
|
|
|
|
FILE *fp;
|
2005-08-19 16:34:42 +00:00
|
|
|
int len = sizeof myaddr;
|
|
|
|
int rc;
|
2009-03-06 22:29:49 +00:00
|
|
|
char nonce[16];
|
|
|
|
|
|
|
|
if (get_nonce (nonce, 16))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
unaddr = (struct sockaddr_un *)addr;
|
2005-08-19 16:34:42 +00:00
|
|
|
|
|
|
|
myaddr.sin_port = 0;
|
|
|
|
myaddr.sin_family = AF_INET;
|
|
|
|
myaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
|
|
|
|
|
2009-03-06 22:29:49 +00:00
|
|
|
filefd = open (unaddr->sun_path,
|
|
|
|
(O_WRONLY|O_CREAT|O_EXCL|O_BINARY),
|
|
|
|
(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP));
|
|
|
|
if (filefd == -1)
|
|
|
|
{
|
|
|
|
if (errno == EEXIST)
|
|
|
|
errno = WSAEADDRINUSE;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
fp = fdopen (filefd, "wb");
|
2005-08-19 16:34:42 +00:00
|
|
|
if (!fp)
|
2009-03-06 22:29:49 +00:00
|
|
|
{
|
|
|
|
int save_e = errno;
|
|
|
|
close (filefd);
|
|
|
|
errno = save_e;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = bind (HANDLE2SOCKET (sockfd), (struct sockaddr *)&myaddr, len);
|
|
|
|
if (!rc)
|
|
|
|
rc = getsockname (HANDLE2SOCKET (sockfd),
|
|
|
|
(struct sockaddr *)&myaddr, &len);
|
|
|
|
if (rc)
|
|
|
|
{
|
|
|
|
int save_e = errno;
|
|
|
|
fclose (fp);
|
|
|
|
remove (unaddr->sun_path);
|
|
|
|
errno = save_e;
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
fprintf (fp, "%d\n", ntohs (myaddr.sin_port));
|
|
|
|
fwrite (nonce, 16, 1, fp);
|
2005-08-19 16:34:42 +00:00
|
|
|
fclose (fp);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2009-03-06 22:29:49 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
int res = bind (HANDLE2SOCKET(sockfd), addr, addrlen);
|
|
|
|
if (res < 0)
|
|
|
|
errno = _assuan_sock_wsa2errno (WSAGetLastError ());
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
#else
|
2005-08-19 16:34:42 +00:00
|
|
|
return bind (sockfd, addr, addrlen);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2009-03-06 22:29:49 +00:00
|
|
|
|
|
|
|
int
|
|
|
|
_assuan_sock_get_nonce (struct sockaddr *addr, int addrlen,
|
|
|
|
assuan_sock_nonce_t *nonce)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX)
|
|
|
|
{
|
|
|
|
struct sockaddr_un *unaddr;
|
|
|
|
unsigned short port;
|
|
|
|
|
|
|
|
if (sizeof nonce->nonce != 16)
|
|
|
|
{
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
nonce->length = 16;
|
|
|
|
unaddr = (struct sockaddr_un *)addr;
|
|
|
|
if (read_port_and_nonce (unaddr->sun_path, &port, nonce->nonce))
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
nonce->length = 42; /* Arbitrary valuie to detect unitialized nonce. */
|
|
|
|
nonce->nonce[0] = 42;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
(void)addr;
|
|
|
|
(void)addrlen;
|
|
|
|
nonce->length = 0;
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
_assuan_sock_check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
char buffer[16], *p;
|
|
|
|
size_t nleft;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
if (sizeof nonce->nonce != 16)
|
|
|
|
{
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nonce->length == 42 && nonce->nonce[0] == 42)
|
|
|
|
return 0; /* Not a Unix domain socket. */
|
|
|
|
|
|
|
|
if (nonce->length != 16)
|
|
|
|
{
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = buffer;
|
|
|
|
nleft = 16;
|
|
|
|
while (nleft)
|
|
|
|
{
|
|
|
|
n = _assuan_io_read (SOCKET2HANDLE(fd), p, nleft);
|
|
|
|
if (n < 0 && errno == EINTR)
|
|
|
|
;
|
|
|
|
else if (n < 0 && errno == EAGAIN)
|
|
|
|
Sleep (100);
|
|
|
|
else if (n < 0)
|
|
|
|
return -1;
|
|
|
|
else if (!n)
|
|
|
|
{
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p += n;
|
|
|
|
nleft -= n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (memcmp (buffer, nonce->nonce, 16))
|
|
|
|
{
|
|
|
|
errno = EACCES;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
(void)fd;
|
|
|
|
(void)nonce;
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Public API. */
|
|
|
|
int
|
|
|
|
assuan_sock_close (assuan_fd_t fd)
|
|
|
|
{
|
|
|
|
return _assuan_close (fd);
|
|
|
|
}
|
|
|
|
|
|
|
|
assuan_fd_t
|
|
|
|
assuan_sock_new (int domain, int type, int proto)
|
|
|
|
{
|
|
|
|
return _assuan_sock_new (domain, type, proto);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
assuan_sock_connect (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen)
|
|
|
|
{
|
|
|
|
return _assuan_sock_connect (sockfd, addr, addrlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen)
|
|
|
|
{
|
|
|
|
return _assuan_sock_bind (sockfd, addr, addrlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
assuan_sock_get_nonce (struct sockaddr *addr, int addrlen,
|
|
|
|
assuan_sock_nonce_t *nonce)
|
|
|
|
{
|
|
|
|
return _assuan_sock_get_nonce (addr, addrlen, nonce);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
assuan_sock_check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce)
|
|
|
|
{
|
|
|
|
return _assuan_sock_check_nonce (fd, nonce);
|
|
|
|
}
|