diff --git a/NEWS b/NEWS
index 022af96..e2937d7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,519 +1,528 @@
-Noteworthy changes in version 2.4.6 (unreleased) [C7/A7/R_]
+Noteworthy changes in version 2.5.0 (unreleased) [C8/A8/R0]
------------------------------------------------
+ * New function to change the system hooks for the socket
+ interface. [#3378]
+
+ * Fix the use of the internal usleep in the nPth implementation.
+
+ * Interface changes relative to the 2.4.0 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ assuan_sock_set_system_hooks NEW.
+
Noteworthy changes in version 2.4.5 (2017-12-01) [C7/A7/R5]
------------------------------------------------
* Avoid a blocking close on Windows with nPth. [#3378]
Noteworthy changes in version 2.4.4 (2017-11-16) [C7/A7/R4]
------------------------------------------------
* New configure option --disable-doc.
* Fix the use of nanosleep.
* Portability fixes for OpenBSD and macOS. [#2910]
* Portability fix for systems not defining INADDR_LOOPBACK. [#2447]
* Improve descriptor passing test to fix a Cygwin build
problem. [#3384]
Noteworthy changes in version 2.4.3 (2016-07-14) [C7/A7/R3]
------------------------------------------------
* Allow socket redirection with assuan_socket_connect.
* Speedup spawning programs on Linux
* Fix minor memory leaks
* Portability fixes for Solaris and AIX.
Noteworthy changes in version 2.4.2 (2015-12-02) [C7/A7/R2]
------------------------------------------------
* The nPth version of the connect system hook does now wrap the call
with npth_unprotec/npth_protect to avoid blocking during a connect.
* Add feature to assuan_sock_connect_byname to test for SOCKS5
availability.
Noteworthy changes in version 2.4.1 (2015-11-23) [C7/A7/R1]
------------------------------------------------
* In Tor mode fallback to port 9150 if 9050 is not listening.
* Allow building with older mingw-w64 versions.
Noteworthy changes in version 2.4.0 (2015-11-03) [C7/A7/R0]
------------------------------------------------
* New flags "socks" and "tor-mode" for assuan_sock_{set,get}_flag.
* New function assuan_sock_connect_byname.
* Require at least libgpg-error 1.17.
* Interface changes relative to the 2.3.0 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
assuan_sock_connect_byname NEW.
ASSUAN_SOCK_TOR NEW.
ASSUAN_SOCK_SOCKS NEW.
assuan_sock_set_flag EXTENDED.
assuan_sock_get_flag EXTENDED.
Noteworthy changes in version 2.3.0 (2015-08-28) [C6/A6/R0]
------------------------------------------------
* Now wipes out the memory of the context structure before freeing.
The context may have stored sensitive data in its line buffers.
* Fixed a problem with the data length limit in assuan_inquire.
* Returns GPG_ERR_SOURCE_ASSUAN with errors from functions w/o a
context.
* Two new functions to tweak the behaviour of the socket wrappers.
* Experimental code to support Cygwin's local sockets.
* By default build without a build timestamp.
* Interface changes relative to the 2.2.1 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
assuan_sock_set_flag NEW.
assuan_sock_get_flag NEW.
Noteworthy changes in version 2.2.1 (2015-05-12) [C5/A5/R1]
------------------------------------------------
* Documentation updates.
* Fixed building for Windows with newer versions of Mingw.
Noteworthy changes in version 2.2.0 (2014-12-11) [C5/A5/R0]
------------------------------------------------
* Added support for socket redirection.
* Interface changes relative to the 2.1.3 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
assuan_sock_set_sockaddr_un NEW.
Noteworthy changes in version 2.1.3 (2014-11-07) [C4/A4/R3]
------------------------------------------------
* Performance fix for Windows.
Noteworthy changes in version 2.1.2 (2014-08-17) [C4/A4/R2]
------------------------------------------------
* Fixed portability bugs for Solaris and AIX.
* Added support for ppc64le.
Noteworthy changes in version 2.1.1 (2013-06-24) [C4/A4/R1]
------------------------------------------------
* Limited support for 64 bit Windows. This is sufficient for use by
GpgEX.
Noteworthy changes in version 2.1.0 (2013-02-22)
------------------------------------------------
* Support for the nPth library.
* Add assuan_check_version and two version macros.
* Interface changes relative to the 2.0.3 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ASSUAN_SYSTEM_NPTH_IMPL NEW macro.
ASSUAN_SYSTEM_NPTH NEW macro.
__assuan_read NEW (private).
__assuan_write NEW (private).
__assuan_recvmsg NEW (private).
__assuan_sendmsg NEW (private).
__assuan_waitpid NEW (private).
ASSUAN_VERSION NEW macro.
ASSUAN_VERSION_NUMBER NEW macro.
assuan_check_version NEW.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Noteworthy changes in version 2.0.3 (2011-12-20)
------------------------------------------------
* Make assuan_get_pid work correctly for pipe server.
* Interface changes relative to the 2.0.2 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ASSUAN_FORCE_CLOSE NEW.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Noteworthy changes in version 2.0.2 (2011-06-16)
------------------------------------------------
* A new flag may now be used to convey comments via assuan_transact.
* A new flag value may now be used to disable logging.
* The gpgcedev.c driver now provides a log device.
* It is now possible to overwrite socket and connect functions in
struct assuan_system_hooks.
* Interface changes relative to the 2.0.1 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ASSUAN_CONVEY_COMMENTS NEW.
ASSUAN_NO_LOGGING NEW.
assuan_system_hooks_t CHANGED: Added socket and connect members.
ASSUAN_SYSTEM_HOOKS_VERSION CHANGED: Bumped to 2.
assuan_register_pre_cmd_notify NEW.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Noteworthy changes in version 2.0.1 (2010-08-09)
------------------------------------------------
* Support for WindowsCE.
* Input and output notification handler can now really access the
parsed fd as stated in the manual.
* Cleaned up the logging.
* Interface changes relative to the 2.0.0 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
assuan_free NEW.
_assuan_w32ce_create_pipe NEW.
ASSUAN_LOG_CONTROL NEW.
ASSUAN_NO_LOGGING NEW.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Noteworthy changes in version 2.0.0 (2010-01-08)
------------------------------------------------
* Now using libtool and builds a DSO.
* Lots of interface cleanups. See below for details of the most
important changes. Here is a quick note on how to upgrade:
For each invocation of the connect or server functions, allocate a
context with assuan_new and use that. Instead of assuan_disconnect
or assuan_deinit_server, call assuan_release. Use
assuan_set_gpg_err_source instead of assuan_set_assuan_err_source.
If you use assuan_pipe_connect with NAME of NULL, you have to
provide a non-NULL ARGV argument and check that against "server" or
"client" to determine which end you got after fork(). If you use
the assuan sock interface, you must call assuan_sock_init after
setting global context defaults. Add a NULL as the last arg to
assuan_register_command.
* Pth support has changed. This now follows the same style as
libgcrypt by setting system hook callbacks.
* Interface changes relative to the 1.0.5 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_ASSUAN_ONLY_GPG_ERRORS REMOVED
assuan_set_assuan_err_source REMOVED: Use assuan_set_gpg_err_source.
assuan_set_gpg_err_source NEW
assuan_get_gpg_err_source NEW
assuan_strerror REMOVED
ASSUAN_* Error values removed.
assuan_error_t REMOVED
AssuanError REMOVED
assuan_init_connected_socket_server REMOVED
assuan_pipe_connect2 REMOVED
AssuanCommand REMOVED
assuan_flag_t CHANGED: From enum to unsigned int.
ASSUAN_CONTENT REMOVED
assuan_disconnect REMOVED: Use assuan_release.
assuan_deinit_server REMOVED: Use assuan_release.
assuan_get_malloc_hooks NEW
assuan_set_log_cb NEW
assuan_get_log_cb NEW
assuan_new_ext NEW
assuan_new NEW
assuan_release NEW
assuan_init_socket_server CHANGED: Take ctx arg instead of pointer to ctx.
CHANGED: As assuan_init_socket_server_ext was.
assuan_init_socket_server_ext REMOVED
assuan_socket_connect CHANGED: Take ctx arg instead of pointer to ctx.
CHANGED: Is what assuan_socket_connect_ext was.
assuan_socket_connect_ext REMOVED
assuan_pipe_connect CHANGED: Take ctx arg instead of pointer to ctx.
If NAME is NULL, ARGV will contain fork result.
CHANGED: Is now what assuan_pipe_connect_ext was.
CHANGED: Child fds are now assuan_fd_t.
assuan_pipe_connect_ext REMOVED
assuan_init_pipe_server CHANGED: Take ctx arg instead of pointer to ctx.
CHANGED: Swallows fds (are closed at end).
CHANGED: Take assuan_fd_t.
assuan_fdopen NEW
assuan_set_io_hooks REMOVED: Use assuan_system_hooks interface.
assuan_io_hooks_t REMOVED: Use assuan_system_hooks interface.
assuan_io_monitor_t CHANGED: Add a hook data argument.
assuan_get_command_name NEW
assuan_msghdr_t NEW
ASSUAN_INVALID_PID NEW
ASSUAN_NO_FIXSIGNALS NEW
ASSUAN_SYSTEM_HOOKS_VERSION NEW
assuan_system_hooks_t NEW
assuan_set_system_hooks NEW
assuan_ctx_set_system_hooks NEW
ASSUAN_SYSTEM_PTH_IMPL NEW
ASSUAN_SYSTEM_PTH_DECL NEW
ASSUAN_SYSTEM_PTH NEW
assuan_sock_init NEW
assuan_sock_deinit NEW
assuan_handler_t NEW
assuan_register_command CHANGED: Add arg HELP_STRING.
assuan_register_bye_notify CHANGED: Handler gets line and returns err now.
assuan_register_reset_notify CHANGED: Handler gets line and returns err now.
assuan_register_cancel_notify CHANGED: Handler gets line and returns err now.
assuan_register_input_notify CHANGED: Handler returns error now.
assuan_register_output_notify CHANGED: Handler returns error now.
assuan_process_next CHANGED: New DONE argument instead EOF return.
ASSUAN_PIPE_CONNECT_FDPASSING NEW
ASSUAN_PIPE_CONNECT_DETACHED NEW
ASSUAN_SOCKET_SERVER_FDPASSING NEW
ASSUAN_SOCKET_SERVER_ACCEPTED NEW
ASSUAN_SOCKET_CONNECT_FDPASSING NEW
assuan_peercred_t NEW
assuan_get_peercred CHANGED: Return assuan_peercred_t.
assuan_client_read_response NEW
assuan_client_parse_response NEW
assuan_fd_from_posix_fd NEW
ASSUAN_SPAWN_DETACHED NEW
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Noteworthy changes in version 1.0.5 (2008-05-25)
------------------------------------------------
* Minor fixes.
* Build library for GNU/Linux as PIC.
Noteworthy changes in version 1.0.4 (2007-12-12)
------------------------------------------------
* New socket wrapper functions to support Unix domain sockets under
Windows.
* New hook feature to enhance the internal I/O functions.
Noteworthy changes in version 1.0.3 (2007-08-24)
------------------------------------------------
* New type assuan_fd_t and constant ASSUAN_INVALID_FD for better W32
support. It does not change the semantics under Unix. Under W32
all file descriptors are now guaranteed to be system handles.
* New functions assuan_process_done and assuan_inquire_ext to support
external event loops.
* Changed the license of the library code back to LGPLv2.1 to support
a bunch of GPLv2(only) software which does not allow the use of
LGPLv3. Note that this is only a temporary change and authors of
GPLv2(only) software are asked to switch to GPLv3 or to add an
exception which allow the use of LPGLv3 software.
Noteworthy changes in version 1.0.2 (2007-07-05)
------------------------------------------------
* Changed license to LGPLv3.
* New flag ASSUAN_CONFIDENTIAL to return the state of
confidential logging.
* Better support for W32.
* Assorted bug fixed and code cleanups.
Noteworthy changes in version 1.0.1 (2006-11-22)
------------------------------------------------
* New function: assuan_set_io_monitor.
* New function: assuan_register_post_cmd_notify.
* Fixed a memory leak.
Noteworthy changes in version 1.0.0 (2006-10-31)
------------------------------------------------
* Finished the manual.
Noteworthy changes in version 0.9.3 (2006-10-10)
------------------------------------------------
* Portability fixes.
* Pth is not anymore linked by means of weak symbol tricks. It is
now required to link to the pth version of libassuan. New autoconf
macros are provided to to check for this. The pth version is only
build if Pth is available.
* configure does now check that descripotor passing is available. A
way to check at runtime for this is also provided
Noteworthy changes in version 0.9.2 (2006-10-04)
------------------------------------------------
* A fix to make CANCEL work again in Pinentries.
Noteworthy changes in version 0.9.1 (2006-10-04)
------------------------------------------------
* Minor bug fixes
* Portability fixes.
Noteworthy changes in version 0.9.0 (2006-09-14)
------------------------------------------------
* Internal cleanups to make inclusion of the code into libraries
easier.
* Made clear that the software is under the LGPL.
* New function assuan_set_assuan_err_source. All gpg-error enabled
software should call this right at startup to switch libassuan into
the gpg-error style mode. All error codes are then returned as
gpg-error style codes (GPG_ERR_ASS_* as well as others).
If the new macro _ASSUAN_ONLY_GPG_ERRORS is defned all old
definitions are excluded from assuan.h.
* Logging of hex strings is now limited to 16 bytes. To enable
printing of the full data, a new environment variable
ASSUAN_FULL_LOGGING may be set to any value.
* Removed the assuan_domain_* functions.
* New functions assuan_pipe_connect_ext and assuan_socket_connect_ext
to allow connections on a socketpair and to pass descriptors.
* New function assuan_get_peercred.
Noteworthy changes in version 0.6.10 (2005-06-20)
-------------------------------------------------
* New functions assuan_get_flag and assuan_set_flag.
* Add flag ASSUAN_NO_WAITPID.
Noteworthy changes in version 0.6.9 (2004-12-22)
------------------------------------------------
* Ported to W32 based systems.
Noteworthy changes in version 0.6.8 (2004-11-25)
------------------------------------------------
* assuan_write_status does now return an error code.
* Fixes for C89 compatibility and some first takes on a W32 port.
Noteworthy changes in version 0.6.7 (2004-09-27)
------------------------------------------------
* Minor build fixes.
Noteworthy changes in version 0.6.6 (2004-06-08)
------------------------------------------------
* assuan_set_hello_line may now take a multi line argument where the
first lines are send as comment lines and the last one as a OK
line.
Noteworthy changes in version 0.6.5 (2004-04-29)
------------------------------------------------
* Pass the client's pid to a pipe server.
Noteworthy changes in version 0.6.4 (2004-02-20)
------------------------------------------------
* Will now also build on systems not providing funopen or
fopencookie.
* Some smaller build fixes.
Noteworthy changes in version 0.6.3 (2004-01-29)
------------------------------------------------
* Fixed a data corruption bug in assuan_get_data_fp.
* New function assuan_pipe_connect2.
Noteworthy changes in version 0.6.2 (2003-12-18)
------------------------------------------------
* New function assuan_set_assuan_log_prefix to store a log prefix to
be used when no context is available. The existing function
assuan_get_assuan_log_context is not anymore declared as user
overridable.
* Documentation cleanups.
Noteworthy changes in version 0.6.1 (2003-11-17)
------------------------------------------------
* Fixed a bug in assuan_inquire which led to an Invalid_Value error
for large inquiry parameters.
* Fixed a bug in the client socket connect code.
Noteworthy changes in version 0.6.0 (2003-08-06)
------------------------------------------------
* Initial release as a standalone library.
Copyright 2003, 2004, 2006, 2007, 2011,
2013 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
modifications, as long as this notice is preserved.
This file is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/configure.ac b/configure.ac
index 40c378c..4128f18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,496 +1,496 @@
# configure.ac - for libassuan
# Copyright (C) 2001, 2002, 2003, 2006, 2007, 2009,
# 2011, 2012, 2013 Free Software Foundation, Inc.
# Copyright (C) 2013, 2014, 2015 g10 Code GmbH
#
# This file is part of Assuan.
#
# 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.
#
# 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.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, see .
# SPDX-License-Identifier: LGPL-2.1+
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
min_automake_version="1.14"
# To build a release you need to create a tag with the version number
# (git tag -s libassuan-n.m.k) and run "./autogen.sh --force". Please
# bump the version number immediately after the release and do another
# commit and push so that the git magic is able to work. See below
# for the LT versions.
m4_define([mym4_package],[libassuan])
m4_define([mym4_major], [2])
-m4_define([mym4_minor], [4])
-m4_define([mym4_micro], [6])
+m4_define([mym4_minor], [5])
+m4_define([mym4_micro], [0])
# To start a new development series, i.e a new major or minor number
# you need to mark an arbitrary commit before the first beta release
# with an annotated tag. For example a 2.1 branch starts off with
# the tag "foo-2.1-base". This is used as the base for counting
# beta numbers before the first release of a series.
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
# flag indicating a development version (mym4_isbeta). Note that the
# m4 processing is done by autoconf and not during the configure run.
m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \
mym4_package mym4_major mym4_minor mym4_micro),[:]))
m4_define([mym4_isbeta], m4_argn(2, mym4_verslist))
m4_define([mym4_version], m4_argn(4, mym4_verslist))
m4_define([mym4_revision], m4_argn(7, mym4_verslist))
m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
m4_esyscmd([echo ]mym4_version[>VERSION])
AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
# LT Version numbers, remember to change them just *before* a release.
# (Code changed: REVISION++)
# (Interfaces added/removed/changed: CURRENT++, REVISION=0)
# (Interfaces added: AGE++)
# (Interfaces removed/changed: AGE=0)
#
-LIBASSUAN_LT_CURRENT=7
-LIBASSUAN_LT_AGE=7
-LIBASSUAN_LT_REVISION=5
+LIBASSUAN_LT_CURRENT=8
+LIBASSUAN_LT_AGE=8
+LIBASSUAN_LT_REVISION=0
# If the API is changed in an incompatible way: increment the next counter.
LIBASSUAN_CONFIG_API_VERSION=2
##############################################
AC_SUBST(LIBASSUAN_LT_CURRENT)
AC_SUBST(LIBASSUAN_LT_AGE)
AC_SUBST(LIBASSUAN_LT_REVISION)
PACKAGE=$PACKAGE_NAME
VERSION=$PACKAGE_VERSION
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR(src/assuan.h.in)
AC_CONFIG_MACRO_DIR(m4)
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
AM_SILENT_RULES
AB_INIT
AC_GNU_SOURCE
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",[Bug report address])
VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x%02x" mym4_major \
mym4_minor mym4_micro)
AC_SUBST(VERSION_NUMBER)
# Don't default to build static libs.
LT_PREREQ([2.2.6])
LT_INIT([win32-dll disable-static])
LT_LANG([Windows Resource])
# For now we hardcode the use of version scripts. It would be better
# to write a test for this or even implement this within libtool.
have_ld_version_script=no
check_descriptor_passing=yes
case "${host}" in
*-*-cygwin*)
check_descriptor_passing=no
;;
*-*-linux*)
have_ld_version_script=yes
;;
*-*-gnu*)
have_ld_version_script=yes
;;
*-apple-darwin*)
AC_DEFINE(_XOPEN_SOURCE, 500, Activate POSIX interface on MacOS X)
AC_DEFINE(_DARWIN_C_SOURCE, 900000L,
Expose all libc features (__DARWIN_C_FULL))
;;
esac
AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
AH_TOP([
#ifndef _ASSUAN_CONFIG_H_INCLUDED
#define _ASSUAN_CONFIG_H_INCLUDED
/* Enable gpg-error's strerror macro under W32CE. */
#define GPG_ERR_ENABLE_ERRNO_MACROS 1
/* Provide the es_ macro for estream. */
#define GPGRT_ENABLE_ES_MACROS 1
])
AH_BOTTOM([
#endif /*_ASSUAN_CONFIG_H_INCLUDED*/
])
# Checks for programs.
missing_dir=`cd $ac_aux_dir && pwd`
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
AC_PROG_AWK
AC_PROG_CC
AC_PROG_CPP
AM_PROG_CC_C_O
if test "x$ac_cv_prog_cc_c89" = "xno" ; then
AC_MSG_ERROR([[No C-89 compiler found]])
fi
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
#AC_ARG_PROGRAM
# We need to compile and run a program on the build machine. A
# comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in
# the AC archive is broken for autoconf 2.57. Given that there is no
# newer version of that macro, we assume that it is also broken for
# autoconf 2.61 and thus we use a simple but usually sufficient
# approach.
AC_MSG_CHECKING(for cc for build)
if test "$cross_compiling" = "yes"; then
CC_FOR_BUILD="${CC_FOR_BUILD-cc}"
else
CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
fi
AC_MSG_RESULT($CC_FOR_BUILD)
AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
if test "$GCC" = yes; then
CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
AC_MSG_CHECKING([if gcc supports -Wpointer-arith])
_gcc_cflags_save=$CFLAGS
CFLAGS="-Wpointer-arith"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],_gcc_wopt=yes,_gcc_wopt=no)
AC_MSG_RESULT($_gcc_wopt)
CFLAGS=$_gcc_cflags_save;
if test x"$_gcc_wopt" = xyes ; then
CFLAGS="$CFLAGS -Wpointer-arith"
fi
fi
#
# Options depending on the host OS.
#
have_dosish_system=no
have_w32_system=no
have_w64_system=no
have_w32ce_system=no
case "${host}" in
*-linux*)
if test "$GCC" = yes; then
CFLAGS="$CFLAGS -fPIC -DPIC"
fi
;;
x86_64-*mingw32*)
have_dosish_system=yes
have_w32_system=yes
have_w64_system=yes
;;
*-mingw32ce*)
have_dosish_system=yes
have_w32_system=yes
have_w32ce_system=yes
;;
*-mingw32*)
have_dosish_system=yes
have_w32_system=yes
;;
*-solaris*)
AC_DEFINE(_XOPEN_SOURCE, 500, Activate extensions on Solaris)
AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Activate extensions on Solaris)
AC_DEFINE(__EXTENSIONS__, 1, Activate extensions on Solaris)
;;
esac
if test "$have_dosish_system" = yes; then
AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
[Defined if we run on some of the PCDOS like systems
(DOS, Windoze. OS/2) with special properties like
no file modes])
fi
if test "$have_w32_system" = yes; then
AC_DEFINE(HAVE_W32_SYSTEM,1,[Defined if we run on a W32 API based system])
if test "$have_w64_system" = yes; then
AC_DEFINE(HAVE_W64_SYSTEM,1,
[Defined if we run on a 64 bit W32 API based system])
fi
if test "$have_w32ce_system" = yes; then
AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE])
fi
fi
AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
AM_CONDITIONAL(HAVE_W64_SYSTEM, test "$have_w64_system" = yes)
#
# Provide information about the build.
#
BUILD_REVISION="mym4_revision"
AC_SUBST(BUILD_REVISION)
AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
[GIT commit id revision used to build this package])
changequote(,)dnl
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
changequote([,])dnl
BUILD_FILEVERSION="${BUILD_FILEVERSION}mym4_revision_dec"
AC_SUBST(BUILD_FILEVERSION)
AC_ARG_ENABLE([build-timestamp],
AC_HELP_STRING([--enable-build-timestamp],
[set an explicit build timestamp for reproducibility.
(default is the current time in ISO-8601 format)]),
[if test "$enableval" = "yes"; then
BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
else
BUILD_TIMESTAMP="$enableval"
fi],
[BUILD_TIMESTAMP=""])
AC_SUBST(BUILD_TIMESTAMP)
AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
[The time this package was configured for a build])
#
# Check for network libraries. They are needed for tests.
#
AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
[NETLIBS="-lsocket $NETLIBS"]))
AC_SUBST(NETLIBS)
if test "$have_w32_system" = yes; then
if test "$have_w32ce_system" = yes; then
NETLIBS="-lws2 $NETLIBS"
else
# FIXME: Check why we need to use ws2_32 and document that.
NETLIBS="-lws2_32 $NETLIBS"
fi
fi
#
# Provide info for src/libassuan-config.in
#
LIBASSUAN_CONFIG_LIB="-lassuan"
LIBASSUAN_CONFIG_CFLAGS=""
LIBASSUAN_CONFIG_HOST="$host"
LIBASSUAN_CONFIG_EXTRA_LIBS=
if test x"$NETLIBS" != x; then
LIBASSUAN_CONFIG_EXTRA_LIBS="$LIBASSUAN_CONFIG_EXTRA_LIBS $NETLIBS"
fi
AC_SUBST(LIBASSUAN_CONFIG_LIB)
AC_SUBST(LIBASSUAN_CONFIG_CFLAGS)
AC_SUBST(LIBASSUAN_CONFIG_HOST)
AC_SUBST(LIBASSUAN_CONFIG_API_VERSION)
AC_SUBST(LIBASSUAN_CONFIG_EXTRA_LIBS)
#
# Checks for header files.
#
AC_HEADER_STDC
AC_CHECK_HEADERS([string.h locale.h sys/uio.h stdint.h inttypes.h \
sys/types.h sys/stat.h unistd.h sys/time.h fcntl.h \
sys/select.h ])
AC_TYPE_UINTPTR_T
AC_TYPE_UINT16_T
#
# Checks for typedefs, structures, and compiler characteristics.
#
AC_C_CONST
AC_C_INLINE
AC_TYPE_SIZE_T
AC_TYPE_SIGNAL
AC_DECL_SYS_SIGLIST
gl_HEADER_SYS_SOCKET
gl_TYPE_SOCKLEN_T
if test $check_descriptor_passing != yes; then
use_descriptor_passing=no
else
AC_CHECK_MEMBER(struct cmsghdr.cmsg_len,
[use_descriptor_passing=yes],
[use_descriptor_passing=no
AC_MSG_WARN([
***
*** Data structure for sending ancillary data missing.
*** Descriptor passing won't work.
***])],[
#include
#include
#include
#include
#include
#include
#if HAVE_SYS_UIO_H
#include
#endif
#include
])
fi
if test "$use_descriptor_passing" = "yes"; then
AC_DEFINE(USE_DESCRIPTOR_PASSING, 1,
[Defined if descriptor passing is supported])
fi
AM_CONDITIONAL(USE_DESCRIPTOR_PASSING, test "$use_descriptor_passing" = "yes")
# Checking for libgpg-error.
AM_PATH_GPG_ERROR(1.17,, AC_MSG_ERROR([libgpg-error was not found]))
#
# Checks for library functions.
#
AC_CHECK_FUNCS([flockfile funlockfile inet_pton stat getaddrinfo \
getrlimit ])
# If we didn't find inet_pton, it might be in -lsocket (which might
# require -lnsl)
if test X"$ac_cv_func_inet_pton" != X"yes" ; then
AC_SEARCH_LIBS([inet_pton],[socket],[],[],[-lnsl])
if test X"$ac_cv_search_inet_pton" != X"no" ; then
AC_DEFINE([HAVE_INET_PTON],1,[Define to 1 if you have `inet_pton'.])
fi
fi
# On some systems (e.g. Solaris) nanosleep requires linking to librl.
# Given that we use nanosleep only as an optimization over a select
# based wait function we want it only if it is available in libc.
_save_libs="$LIBS"
AC_SEARCH_LIBS([nanosleep], [],
[AC_DEFINE(HAVE_NANOSLEEP,1,
[Define to 1 if you have the `nanosleep' function in libc.])])
LIBS="$_save_libs"
# Check for funopen
AC_CHECK_FUNCS(funopen)
if test $ac_cv_func_funopen != yes; then
# No funopen but we can implement that in terms of fopencookie.
AC_CHECK_FUNCS(fopencookie)
if test $ac_cv_func_fopencookie = yes; then
AC_LIBOBJ([funopen])
else
AC_MSG_WARN([
***
*** No implementation of fopencookie or funopen available.
*** The assuan_get_data_fp function won't work; see the
*** manual for details. GnuPG does not require this feature.
***])
fi
fi
AC_REPLACE_FUNCS(isascii)
AC_REPLACE_FUNCS(putc_unlocked)
AC_REPLACE_FUNCS(memrchr)
AC_REPLACE_FUNCS(stpcpy)
AC_CHECK_HEADERS(unistd.h)
AC_REPLACE_FUNCS(setenv)
#
# Check for the getsockopt SO_PEERCRED
#
AC_MSG_CHECKING(for SO_PEERCRED)
AC_CACHE_VAL(assuan_cv_sys_so_peercred,
[AC_TRY_COMPILE([#include ],
[struct ucred cr;
int cl = sizeof cr;
getsockopt (1, SOL_SOCKET, SO_PEERCRED, &cr, &cl);],
assuan_cv_sys_so_peercred=yes,
assuan_cv_sys_so_peercred=no)
])
AC_MSG_RESULT($assuan_cv_sys_so_peercred)
if test $assuan_cv_sys_so_peercred = yes; then
AC_DEFINE(HAVE_SO_PEERCRED, 1,
[Defined if SO_PEERCRED is supported (Linux specific)])
else
# Check for the getsockopt LOCAL_PEEREID (NetBSD)
AC_MSG_CHECKING(for LOCAL_PEEREID)
AC_CACHE_VAL(assuan_cv_sys_so_local_peereid,
[AC_TRY_COMPILE([#include
#include ],
[struct unpcbid unp;
int unpl = sizeof unp;
getsockopt (1, SOL_SOCKET, LOCAL_PEEREID, &unp, &unpl);],
assuan_cv_sys_so_local_peereid=yes,
assuan_cv_sys_so_local_peereid=no)
])
AC_MSG_RESULT($assuan_cv_sys_so_local_peereid)
if test $assuan_cv_sys_so_local_peereid = yes; then
AC_DEFINE(HAVE_LOCAL_PEEREID, 1,
[Defined if LOCAL_PEEREID is supported (NetBSD specific)])
else
# (Open)Solaris
AC_CHECK_FUNCS([getpeerucred], AC_CHECK_HEADERS([ucred.h]))
if test $ac_cv_func_getpeerucred != yes; then
# FreeBSD
AC_CHECK_FUNCS([getpeereid])
fi
fi
fi
#
# Extra features
#
build_doc=yes
AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc],
[do not build the documentation]),
build_doc=$enableval, build_doc=yes)
AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno])
#
# Create the config files.
#
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([m4/Makefile])
AC_CONFIG_FILES([src/Makefile])
AC_CONFIG_FILES([doc/Makefile])
AC_CONFIG_FILES([tests/Makefile])
AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
AC_CONFIG_FILES([src/versioninfo.rc])
AC_OUTPUT
echo "
Libassuan v${VERSION} has been configured as follows:
Revision: mym4_revision (mym4_revision_dec)
Platform: $host
"
diff --git a/doc/assuan.texi b/doc/assuan.texi
index aae3de7..5c423d0 100644
--- a/doc/assuan.texi
+++ b/doc/assuan.texi
@@ -1,2150 +1,2158 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename assuan.info
@macro copyrightnotice
Copyright @copyright{} 2001--2013 Free Software Foundation, Inc. @*
Copyright @copyright{} 2001--2015 g10 Code GmbH
@end macro
@macro permissionnotice
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 3 of the License, or (at your
option) any later version. The text of the license can be found in the
section entitled ``Copying''.
@end macro
@include version.texi
@settitle Developing with Assuan
@c Create a separate index for command line options.
@defcodeindex op
@c Merge the standard indexes into a single one.
@syncodeindex fn cp
@syncodeindex vr cp
@syncodeindex ky cp
@syncodeindex pg cp
@syncodeindex tp cp
@c A simple macro for optional variables.
@macro ovar{varname}
@r{[}@var{\varname\}@r{]}
@end macro
@c printing stuff taken from gcc.
@macro gnupgtabopt{body}
@code{\body\}
@end macro
@macro gnupgoptlist{body}
@smallexample
\body\
@end smallexample
@end macro
@c Makeinfo handles the above macro OK, TeX needs manual line breaks;
@c they get lost at some point in handling the macro. But if @macro is
@c used here rather than @alias, it produces double line breaks.
@iftex
@alias gol = *
@end iftex
@ifnottex
@macro gol
@end macro
@end ifnottex
@c Change the font used for @def... commands, since the default
@c proportional one used is bad for names starting __.
@tex
\gdef\mysetfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
\global\mysetfont\defbf\ttbshape{10}{\magstep1}
@end tex
@c %**end of header
@ifnottex
@dircategory GNU Libraries
@direntry
* Assuan: (assuan). An IPC library for non-persistent servers.
@end direntry
This file documents the use and the internals of Assuan.
This is Edition @value{EDITION}, last updated @value{UPDATED}, of
@cite{The `Developing with Assuan' Manual}, for Version @value{VERSION}.
@sp 1
Published by the Free Software Foundation@*
51 Franklin Street, Fifth Floor@*
Boston, MA 02110-1301 USA
@sp 1
@copyrightnotice{}
@sp 1
@permissionnotice{}
@end ifnottex
@setchapternewpage odd
@titlepage
@title Developing with Assuan
@subtitle Version @value{VERSION}
@subtitle @value{UPDATED}
@author by Werner Koch and Marcus Brinkmann
@author @code{@{wk,mb@}@@g10code.com}
@page
@vskip 0pt plus 1filll
@copyrightnotice{}
@sp 2
@permissionnotice{}
@end titlepage
@summarycontents
@contents
@page
@ifnottex
@node Top
@top Introduction
@cindex introduction
This manual documents how to exploit the Assuan library, a simple
interprocess communcation library.
@end ifnottex
@menu
* Introduction:: An introduction to and the motivation behind Assuan.
* Assuan:: Description of the Assuan protocol.
* Implementation:: Overview of the implementation.
* Preparation:: What you should do before using the library.
* Generalities:: Initialization code and data types used.
* Client code:: How to develop an Assuan client.
* Server code:: How to develop an Assuan server.
* External I/O Loop:: How to use external I/O event loops.
* Utilities:: Utility functions.
* Socket wrappers:: Socket wrapper functions.
Miscellaneous
* Library Copying:: GNU Lesser General Public License says
how you can copy and share Assuan.
* Copying:: How you can copy and share this manual.
Indices
* Index:: Index of concepts and symbol names.
@end menu
@c
@c I N T R O
@c
@node Introduction
@chapter Introduction to Assuan
Assuan is an extensible inter-process communication (IPC) protocol and
library. It is designed for point-to-point communication and it
doesn't provide a naming system. To contact a server, either the
client must know how to locate the server, e.g., via a well-known Unix
domain socket, or, if the server is transient, how to start it. In
the latter case, Assuan provides functionality to start the server
process.
In Assuan, communication is typically either via a pipe or a Unix
domain socket. This method is neither elegant nor efficient,
especially when there is a lot of data spread across several
transactions. Not only is there a penalty for an increased number of
context switches, but a significant amount of data is @var{memcpy}ed
from the client to a file descriptor and from the file descriptor to
the server. Despite these and other disadvantages, this type of
client/server communication is useful: the client is separated from
the server: they run in different address spaces. This is especially
important in situations where the server must have a known degree of
reliability and data must be protected: as the Assuan protocol is well
defined and clients cannot corrupt the servers' address space,
auditing becomes much easier.
Assuan was developed for use by the GNU Privacy Guard (GnuPG) to
prevent potentially buggy clients from unwittingly corrupting
sensitive transactions or compromising data such as a secret key.
Assuan permits the servers, which do the actual work, e.g., encryption
and decryption of data using a secret key, to be developed
independently of the user interfaces, e.g., mail clients and other
encryption front ends. Like a shared library, the interface is well
defined and any number of front ends can use it; however, unlike a
shared library, the client cannot see or touch the server's data. As
with any modular system, Assuan helps keep the components small,
understandable and less error prone.
Assuan is not, however, limited to use with GnuPG servers and clients:
it was designed to be flexible enough to meet the demands of many
transaction-based environments.
@node Assuan
@chapter Description of the Assuan protocol.
The architecture of the modular GnuPG system is based on several
highly specialized modules which form a network of clients and
servers. A common framework for intermodule communication is
therefore needed and implemented as a library.
Goals:
@itemize @bullet
@item Common framework for module communication
@item Easy debugging
@item Easy module testing
@item Extensible
@item Optional authentication and encryption facility
@item Usable to access external hardware
@end itemize
Design criteria:
@itemize @bullet
@item Client/Server with back channel
@item Use a mainly text based protocol
@item Escape certain control characters
@item Allow indefinite data length
@item Request confidentiality for parts of the communication
@item Dummy module to allow direct linking of client and server
@item Inline data or descriptor passing for bulk data
@item No protection against DoS needed
@item Subliminal channels are not an issue
@end itemize
@node Implementation
@chapter Implementation
The implementation is line based with a maximum line size of 1000
octets. The default IPC mechanism is Unix Domain Sockets.
On connect, the server responds either with okay or an error status.
To perform an authentication check, the server may send an Inquiry
response prior to the first Okay. It may also issue Status messages.
The server must check that the client is allowed to connect. This is
done by requesting the credentials for the peer and comparing them
with the server's credentials. This avoids attacks based on wrong
socket permissions.
The server may choose to delay the first response in case of an error.
The server, however, never closes the connection, however, the lower
protocol may do so after some time of inactivity or when the
connection enters an error state.
All textual messages are assumed to be in UTF-8 unless otherwise noted.
@menu
* Server responses:: Description of server responses.
* Client requests:: Description of client requests.
* Error codes:: List of error and status codes.
@end menu
@node Server responses
@section Server responses
@table @code
@item OK []
Request was successful.
@item ERR @var{errorcode} []
Request could not be fulfilled. The possible error codes are defined
by @code{libgpg-error}.
@item S @var{keyword}
Informational output by the server, which is still processing the
request. A client may not send such lines to the server while
processing an Inquiry command. @var{keyword} shall start with a
letter or an underscore.
@item #
Comment line issued only for debugging purposes. Totally ignored.
@item D
Raw data returned to client. There must be exactly one space after the
'D'. The values for '%', CR and LF must be percent escaped; these are
encoded as %25, %0D and %0A, respectively. Only uppercase letters
should be used in the hexadecimal representation. Other characters
may be percent escaped for easier debugging. All Data lines are
considered one data stream up to the OK or ERR response. Status and
Inquiry Responses may be mixed with the Data lines.
@item INQUIRE @var{keyword}
The server needs further information from the client. The client
should respond with data (using the ``D'' command and terminated by
``END''). Alternatively, the client may cancel the current operation
by responding with ``CAN''.
@end table
Consider the following examples (lines prefixed with S indicate text
that the server sends; lines prefixed with C indicate text that the
client sends):
@example
S: INQUIRE foo
C: D foo bar
C: D bar baz
C: END
[Server continues normal work]
@end example
This implements a callback to the client:
@example
S: INQUIRE foo
C: END
[Server continues]
@end example
and:
@example
S: INQUIRE foo
C: CAN
[Server terminates the operaion and in most cases returns an ERR to the client.]
@end example
But, CAN may also mean ``I have no data for you, try to get it from
elsewhere.''
Note: lines longer than 1000 bytes should be treated as a
communication error. (The rationale for having a line length limit is
to allow for easier multiplexing of several channels.)
@node Client requests
@section Client requests
The server waits for client requests after sending an Okay or Error.
The client should not issue a request in other cases.
@example
@var{command}
@end example
@var{command} is a one word string without preceding white space.
Parameters are command specific, CR, LF and the percent signs should
be percent escaped as described above. To send a backslash as the
last character it should also be percent escaped. Percent escaping is
allowed anywhere in the parameters but not in the command. The line
ends with a CR, LF pair or just a LF.
Not yet implemented feature: If there is a need for a parameter list
longer than the line length limit (1000 characters including command
and CR, LF), the last character of the line (right before the CR/LF or
LF) must be a unescaped (i.e., literal) backslash. The following line
is then expected to be a continuation of the line with the backslash
replaced by a blank and the line ending removed.
@example
D
@end example
Sends raw data to the server. There must be exactly one space after
the 'D'. The values for '%', CR and LF must be percent escaped.
These are encoded as %25, %0D and %0A, respectively. Only uppercase
letters should be used in the hexadecimal representation. Other
characters may be percent escaped for easier debugging. All Data
lines are considered one data stream up to the @code{OK} or @code{ERR}
response. Status and Inquiry Responses may be mixed with the Data
lines.
@example
END
@end example
Lines beginning with a @code{#} or empty lines are ignored. This is
useful to comment test scripts.
Although the commands are application specific, some of them are used
by all protocols and partly supported by the Assuan library:
@table @code
@item BYE
Close the connection. The server will respond with @code{OK}.
@item RESET
Reset the connection but not any existing authentication. The server
should release all resources associated with the connection.
@item END
Used by a client to mark the end of raw data. The server may send
@code{END} to indicate a partial end of data.
@item HELP
Lists all commands that the server understands as comment lines on the
status channel.
@item QUIT
Reserved for future extensions.
@item OPTION
Set options for the connection. The syntax of such a line is
@display
OPTION @var{name} [ [=] @var{value} ]
@end display
Leading and trailing spaces around @var{name} and @var{value} are
allowed but should be ignored. For compatibility reasons, @var{name}
may be prefixed with two dashes. The use of the equal sign is optional
but suggested if @var{value} is given.
@item CANCEL
This command is reserved for future extensions.
@item AUTH
This command is reserved for future extensions. Not yet specified as
we don't implement it in the first phase. See Werner's mail to gpa-dev on
2001-10-25 about the rationale for measurements against local attacks.
@item NOP
No operation. Returns OK without any action.
@end table
@node Error codes
@section Error codes
Libassuan is used with gpg-error style error codes. It is recommended
to set the error source to a different value from the default
@code{GPG_ERR_SOURCE_UNKNOWN} by calling @ref{function
assuan_set_gpg_err_source} early.
@c
@c P R E P A R A T I O N
@c
@node Preparation
@chapter Preparation
To use @sc{Assuan}, you have to make some changes to your
sources and the build system. The necessary changes are small and
explained in the following sections.
@menu
* Header:: What header file you need to include.
* Building sources:: How to build sources using the library.
* Automake:: How to build sources with the help of Automake.
* Multi Threading:: How @code{libassuan} can be used in a MT environment.
@end menu
@node Header
@section Header
All interfaces (data types and functions) of @code{libassuan} are defined
in the header file @file{assuan.h}. You must include this in all source
files using the library, either directly or through some other header
file, like this:
@example
#include
@end example
The namespace of @code{libassuan} is @code{assuan_*} for function
and type names and @code{ASSUAN*} for other symbols. In addition the
same name prefixes with one prepended underscore are reserved for
internal use and should never be used by an application.
Because @code{libassuan} makes use of the GPG Error library, using
@code{libassuan} will also use the @code{GPG_ERR_*} namespace
directly, and the @code{gpg_err*} and @code{gpg_str*} namespaces
indirectly.
@node Building sources
@section Building sources
If you want to compile a source file including the @file{assuan.h}
header file, you must make sure that the compiler can find it in the
directory hierarchy. This is accomplished by adding the path to the
directory in which the header file is located to the compilers include
file search path (via the @option{-I} option).
However, the path to the include file is determined at the time the
source is configured. To solve this problem, @code{libassuan} ships with
a small helper program @command{libassuan-config} that knows the path to
the include file and other configuration options. The options that need
to be added to the compiler invocation at compile time are output by the
@option{--cflags} option to @command{libassuan-config}. The following
example shows how it can be used at the command line:
@example
gcc -c foo.c $(libassuan-config --cflags)
@end example
Adding the output of @samp{libassuan-config --cflags} to the compiler's
command line will ensure that the compiler can find the @file{assuan.h}
header file.
A similar problem occurs when linking the program with the library.
Again, the compiler/linker has to find the library files. For this to
work, the path to the library files has to be added to the library
search path (via the @option{-L} option). For this, the option
@option{--libs} to @command{libassuan-config} can be used. For
convenience, this option also outputs all other options that are
required to link the program with the @code{libassuan} libraries (in
particular, the @option{-lassuan} option). The example shows how to
link @file{foo.o} with the @code{libassuan} library to a program
@command{foo}.
@example
gcc -o foo foo.o $(libassuan-config --libs)
@end example
You can also combine both examples to a single command by specifying
both options to @command{libassuan-config}:
@example
gcc -o foo foo.c $(libassuan-config --cflags --libs)
@end example
@node Automake
@section Building sources using Automake
It is much easier if you use GNU Automake instead of writing your own
Makefiles. If you do that you do not have to worry about finding and
invoking the @command{libassuan-config} script at all. @code{libassuan}
provides an Automake macro that does all the work for you.
@defmac AM_PATH_LIBASSUAN (@ovar{minimum-version}, @ovar{action-if-found}, @ovar{action-if-not-found})
Check whether @code{libassuan} (at least version
@var{minimum-version}, if given) exists on the host system. If it is
found, execute @var{action-if-found}, otherwise do
@var{action-if-not-found}, if given.
Additionally, the function defines @code{LIBASSUAN_CFLAGS} to the
flags needed for compilation of the program to find the
@file{assuan.h} header file, and @code{LIBASSUAN_LIBS} to the linker
flags needed to link the program to the @code{libassuan} library.
@end defmac
You can use the defined Autoconf variables like this in your
@file{Makefile.am}:
@example
AM_CPPFLAGS = $(LIBASSUAN_CFLAGS)
LDADD = $(LIBASSUAN_LIBS)
@end example
@node Multi Threading
@section Multi Threading
The @code{libassuan} library is designed so that it can be used in a
threaded application, if some rules are followed.
@itemize @bullet
@item Run the initialization functions before you actually start
to use threads. Specifically, the functions
@code{assuan_set_gpg_err_source}, @code{assuan_set_malloc_hooks} and
@code{assuan_set_log_cb} should not be called concurrently with
@code{assuan_new}. Use @code{assuan_new_ext} instead or ensure proper
serialization.
@item Only one thread at a time may access an @code{libassuan} context.
@item If you use the default log handler, use
@code{assuan_set_assuan_log_stream} to setup a default log stream.
@item If you have callback functions shared by multiple functions,
the callback function must be reentrant for that purpose.
@code{libassuan} does not serialize invocation of callback functions
across contexts.
@end itemize
@c
@c G E N E R A L I T I E S
@c
@node Generalities
@chapter Generalities
@menu
* Data Types:: Data types used by @code{libassuan}.
* Initializing the library:: How to initialize the library.
* Default Log Handler:: How to configure the default log handler.
* Contexts:: How to work with contexts.
* Reading and Writing:: How to communicate with the peer.
@end menu
@node Data Types
@section Data Types used by the library
@sc{Assuan} uses a so-called context to store a connection's state.
The following data type is used for that:
@deftp {Data type} assuan_context_t
The @code{assuan_context_t} type is a pointer to an object maintained
internally by the library. Contexts are allocated with
@code{assuan_new} or @code{assuan_new_ext} and released with
@code{assuan_release}. Other functions take this data type to access
the state created by these functions.
@end deftp
@deftp {Data type} assuan_fd_t
The @code{assuan_fd_t} is a file descriptor (in Unix) or a system
handle (in Windows). The special value @code{ASSUAN_INVALID_FD} is
used to specify invalid Assuan file descriptors.
@end deftp
@deftypefun assuan_fd_t assuan_fdopen (@w{int @var{fd}})
Create an assuan file descriptor from a POSIX (libc) file descriptor
@var{fd}. On Unix, this is equivalent to @code{dup}, while on Windows
this will retrieve the underlying system handle with
@code{_get_osfhandle} and duplicate that.
@end deftypefun
@node Initializing the library
@section Initializing the library
Libassuan makes use of Libgpg-error and assumes that Libgpg-error has
been initialized. In general @code{gpgrt_check_version} should be
called to guarantee this; the Libgpg-error manual for details.
Libassuan itself requires no initialization. There are however some
initialization hooks provided which are often useful. These should be
called as early as possible and in a multi-threaded application before
a second thread is created.
These functions initialize default values that are used at context
creation with @code{assuan_new}. As there can only be one default,
all values can also be set directly with @code{assuan_new_ext} or with
context-specific functions after context creation.
If your application uses its own memory allocation functions or wrappers
it is good idea to tell @code{libassuan} about it so it can make use of the
same functions or wrappers:
@deftp {Data type} {struct assuan_malloc_hooks}
This structure is used to store the memory allocation callback
interface functions. It has the following members, whose semantics
are identical to the corresponding system functions:
@table @code
@item void *(*malloc) (size_t cnt)
This is the function called by @sc{Assuan} to allocate memory for a context.
@item void *(*realloc) (void *ptr, size_t cnt)
This is the function called by @sc{Assuan} to reallocate memory for a context.
@item void (*free) (void *ptr)
This is the function called by @sc{Assuan} to release memory for a context.
@end table
@end deftp
@deftp {Data type} {assuan_malloc_hooks_t}
This is a pointer to a @code{struct assuan_malloc_hooks}.
@end deftp
@deftypefun void assuan_set_malloc_hooks (@w{assuan_malloc_hooks_t @var{malloc_hooks}})
This function sets the default allocation hooks for new contexts
allocated with @code{assuan_new}. You need to provide all three
functions. Those functions need to behave exactly as their standard
counterparts @code{malloc}, @code{realloc} and @code{free}. If you
write your own functions, please take care to set @code{errno}
whenever an error has occurred.
@end deftypefun
@deftypefun assuan_malloc_hooks_t assuan_get_malloc_hooks ()
This function gets the default allocation hooks for new contexts
allocated with @code{assuan_new}. The result structure is statically
allocated and should not be modified.
@end deftypefun
The @sc{Assuan} library uses @code{libgpg-error} error values, which
consist and error code and an error source. The default source used
by contexts allocated with @code{assuan_new} can be set with the
following function.
@anchor{function assuan_set_gpg_err_source}
@deftypefun void assuan_set_gpg_err_source (@w{gpg_err_source_t @var{err_source}})
This function sets the default error source for errors generated by
contexts allocated with @code{assuan_new}.
One way to call this function is
@smallexample
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
@end smallexample
@end deftypefun
@deftypefun gpg_err_source_t assuan_get_gpg_err_source (void)
This function gets the default error source for errors generated by
contexts allocated with @code{assuan_new}.
@end deftypefun
@noindent
To integrate assuan logging and diagnostics into your own logging
system, you may use the following two functions:
@deftp {Data type} {int (*assuan_log_cb_t) (@w{assuan_context_t @var{ctx}}, @w{void *@var{hook_value}}, @w{unsigned int @var{cat}}, @w{const char *@var{msg}})}
The user-provided callback function takes a context @var{ctx}, for
which the message @var{msg} was generated, and a hook value
@var{hook_value} that was supplied when the log handler was registered
for the context with @code{assuan_set_log_cb}, and a category
@var{cat}. The category is one of:
@table @code
@item ASSUAN_LOG_INIT
@item ASSUAN_LOG_CTX
@item ASSUAN_LOG_ENGINE
@item ASSUAN_LOG_DATA
RFU
@item ASSUAN_LOG_SYSIO
Log lowlevel I/O data.
@item ASSUAN_LOG_CONTROL
Log the control channel.
@end table
The user may then, depending on the category, write the message to a
log file or treat it in some other way.
If @var{msg} is a null pointer, then no message should be logged, but
the function should return 1 if it is interested in log messages with
the category @var{cat}. If it is not interested, 0 should be
returned. This allows @code{libassuan} to suppress the generation of
expensive debug output.
@end deftp
@deftypefun void assuan_set_log_cb (@w{assuan_log_cb_t @var{log_cb}}, @w{void *@var{log_cb_data}})
This function sets the default logging handler for log messages
generated by contexts allocated with @code{assuan_new}.
@end deftypefun
@deftypefun void assuan_get_log_cb (@w{assuan_log_cb_t *@var{log_cb}}, @w{void **@var{log_cb_data}})
This function gets the default logging handler for log messages
generated by contexts allocated with @code{assuan_new}.
@end deftypefun
You do not need to set a log handler, as @sc{Assuan} provides a
configurable default log handler that should be suitable for most
purposes. Logging can be disabled completely by setting the log
handler to a null pointer.
@node Default Log Handler
@section Default Log Handler
The default log handler can be configured by the following functions:
@deftypefun void assuan_set_assuan_log_prefix (@w{const char *@var{text}})
Set the prefix to be used at the start of a line emitted by assuan
on the log stream to @var{text}. The default is the empty string.
@end deftypefun
@deftypefun @w{const char *} assuan_get_assuan_log_prefix (void)
Return the prefix to be used at the start of a line emitted by assuan
on the log stream. The default implementation returns the empty
string.
@end deftypefun
@deftypefun void assuan_set_assuan_log_stream (FILE *@var{fp})
This sets the default log stream to which @code{libassuan} should log messages not
associated with a specific context to @var{fp}. The default is to log
to @code{stderr}. This default value is also changed by using
@code{assuan_set_log_stream} (to set a logging stream for a specific
context) unless this function has been used. Obviously this is not
thread-safe and thus it is highly recommended to use this function to
setup a proper default.
@end deftypefun
@deftypefun @w{FILE *} assuan_get_assuan_log_stream (void)
Return the stream which is currently being using for global logging.
@end deftypefun
The log stream used by the default log handler can also be set on a
per context basis.
@deftypefun void assuan_set_log_stream (@w{assuan_context_t @var{ctx}}, @w{FILE *@var{fp}})
Enable debugging for the context @var{ctx} and write all debugging
output to the stdio stream @var{fp}. If the default log stream (used
for non-context specific events) has not yet been set, a call to this
functions implicitly sets this stream also to @var{fp}.
@end deftypefun
@node Contexts
@section How to work with contexts
Some operations work globally on the library, but most operate in a
context, which saves state across operations. To allow the use of
@code{libassuan} in mixed environments, such as in a library using
GPGME and an application using GPGME, the context is very extensive
and covers utilitary information like memory allocation callbacks as
well as specific information associated with client/server operations.
@anchor{function assuan_new}
@deftypefun gpg_error_t assuan_new (@w{assuan_context_t *@var{ctx_p}})
The function @code{assuan_new} creates a new context, using the global
default memory allocation, log handler and @code{libgpg-error} source.
It is equivalent to
@smallexample
gpg_error_t err;
assuan_log_cb_t log_cb;
void *log_cb_data;
assuan_get_log_cb (&log_cb, &log_cb_data);
err = assuan_new_ext (ctx_p, assuan_get_gpg_err_source (),
assuan_get_malloc_hooks (), log_cb, log_cb_data);
@end smallexample
As you can see, this is not thread-safe. Take care not to modify the
memory allocation hooks or log callback handler concurrently with
@code{assuan_new}.
The function returns an error if a memory allocation error occurs, and
0 with the new context in @var{ctx_p} otherwise.
@end deftypefun
@deftypefun gpg_error_t assuan_new_ext (@w{assuan_context_t *@var{ctx_p}}, @w{gpg_err_source_t @var{err_source}}, @w{assuan_malloc_hooks_t @var{malloc_hooks}}, @w{assuan_log_cb_t @var{log_cb}}, @w{void *@var{log_cb_data}})
The function @code{assuan_new_ext} creates a new context using the
supplied @code{libgpg-error} error source @var{err_source}, the memory
allocation hooks @var{malloc_hooks} and the log handler @var{log_cb}
with the user data @var{log_cb_data}.
@end deftypefun
After the context has been used, it can be destroyed again.
@deftypefun void assuan_release (assuan_context_t ctx)
The function @code{assuan_release} destroys the context CTX and
releases all associated resources.
@end deftypefun
Other properties of the context beside the memory allocation handler,
the log handler, and the @code{libgpg-error} source can be set after
context creation. Here are some of them:
@deftypefun void assuan_set_pointer (@w{assuan_context_t @var{ctx}}, @w{void *@var{pointer}})
Store the arbitrary pointer value @var{pointer} into the context
@var{ctx}. This is useful to provide command handlers with additional
application context.
@end deftypefun
@deftypefun void* assuan_get_pointer (@w{assuan_context_t @var{ctx}})
This returns the pointer for context @var{ctx} which has been set using
the above function. A common way to use it is by setting the pointer
before starting the processing loop and to retrieve it right at the
start of a command handler:
@smallexample
static int
cmd_foo (assuan_context_t ctx, char *line)
@{
ctrl_t ctrl = assuan_get_pointer (ctx);
...
@}
@end smallexample
@end deftypefun
@deftypefun void assuan_set_flag (@w{assuan_context_t @var{ctx}}, @w{assuan_flag_t @var{flag}}, @w{int @var{value}})
Set the the @var{flag} for context @var{ctx} to @var{value}. Values for
flags are usually 1 or 0 but certain flags might need other values.
@deftp {Data type} assuan_flag_t
The flags are all named and collected in an @code{enum} for better readability.
Available flags are:
@table @code
@item ASSUAN_NO_WAITPID
When using a pipe server, by default Libassuan will wait for the forked
process to die in @code{assuan_release}. In certain cases this is
not desirable. By setting this flag, a call to @code{waitpid} will be
suppressed and the caller is responsible to cleanup the child process.
@item ASSUAN_CONFIDENTIAL
Use to return the state of the confidential logging mode.
@item ASSUAN_NO_FIXSIGNALS
Do not modify signal handler for @code{SIGPIPE}.
@item ASSUAN_CONVEY_COMMENTS
If enabled comment lines are passed to the status callback of the
@code{assuan_transact}.
@item ASSUAN_FORCE_CLOSE
Setting this flag forces the next command to assume that the
connection has been closed. This breaks the command processing loop
and may be used as an implicit BYE command. @var{value} is ignored
and thus it is not possible to clear this flag.
@end table
@end deftp
@end deftypefun
@deftypefun int assuan_get_flag (@w{assuan_context_t @var{ctx}}, @w{assuan_flag_t @var{flag}})
Return the value of @var{flag} in context @var{ctx}.
@end deftypefun
@deftypefun void assuan_begin_confidential (@w{assuan_context_t @var{ctx}})
Put the logging feature into confidential mode. This is to avoid
logging of sensitive data.
This is identical to:
@smallexample
assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 1);
@end smallexample
@end deftypefun
@deftypefun void assuan_end_confidential (@w{assuan_context_t @var{ctx}})
Get the logging feature out of confidential mode. All data will be
logged again (if logging is enabled).
This is identical to:
@smallexample
assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 0);
@end smallexample
@end deftypefun
@deftp {Data type} {struct assuan_system_hooks}
This structure is used to store the system callback interface
functions. It has the following members, whose semantics are similar
to the corresponding system functions, but not exactly equivalent.
@table @code
@item int version
The user should set this to @code{ASSUAN_SYSTEM_HOOKS_VERSION}. This
indicates to the library which members of this structure are present
in case of future extensions. The user should initialize the whole
structure with zero bytes.
@item void (*usleep) (assuan_context_t ctx, unsigned int usec)
This is the function called by @sc{Assuan} to sleep for @code{USEC}
microseconds.
@item int (*pipe) (assuan_context_t ctx, assuan_fd_t fd[2], int inherit_idx)
This is the function called by @sc{Assuan} to create a pipe. The
returned file descriptor @code{fd[inherit_idx]} must be inheritable by
the child process (under Windows, this requires some extra work).
@item int (*close) (assuan_context_t ctx, assuan_fd_t fd)
This is the function called by @sc{Assuan} to close a file descriptor
created through the system functions.
@item ssize_t (*read) (assuan_context_t ctx, assuan_fd_t fd, void *buffer, size_t size)
This is the function called by @sc{Assuan} to read data from a file
descriptor. It is functionally equivalent to the system @code{read}
function.
@item ssize_t (*write) (assuan_context_t ctx, assuan_fd_t fd, const void *buffer, size_t size)
This is the function called by @sc{Assuan} to write data to a file
descriptor. It is functionally equivalent to the system @code{write}
function.
@item int (*recvmsg) (assuan_context_t ctx, assuan_fd_t fd, assuan_msghdr_t msg, int flags)
This is the function called by @sc{Assuan} to receive a message from a
file descriptor. It is functionally equivalent to the system
@code{recvmsg} function.
@item int (*sendmsg) (assuan_context_t ctx, assuan_fd_t fd, const assuan_msghdr_t msg, int flags);
This is the function called by @sc{Assuan} to send a message to a
file descriptor. It is functionally equivalent to the system
@code{sendmsg} function.
@item int (*spawn) (assuan_context_t ctx, pid_t *r_pid, const char *name, const char **argv, assuan_fd_t fd_in, assuan_fd_t fd_out, assuan_fd_t *fd_child_list, void (*atfork) (void *opaque, int reserved), void *atforkvalue, unsigned int flags)
This is the function called by @sc{Assuan} to spawn a child process.
The @code{stdin} and @code{stdout} file descriptors are provided in
@code{fd_in} and @code{fd_out} respectively, but can be set to
@code{ASSUAN_INVALID_FD}, in which case they are set to
@code{/dev/null}. On systems which use @code{fork} and @code{exec},
the @code{atfork} function should be called with @code{atforkvalue}
and @code{0} for flags in the child process right after @code{fork}
returns. @code{fd_child_list} is a @code{ASSUAN_INVALID_FD}
terminated array (or @code{NULL}) and specifies file descriptors to be
inherited by the child process.
A special situation occurs if @code{name} is a null pointer, in which
case the process should just fork but not call @code{exec}. In this
case, @code{*argv} should be set to @code{"client"} in the parent
process and @code{"server"} in the child process.
Flags is the bit-wise OR of some (or none) of the following flags:
@table @code
@item ASSUAN_SPAWN_DETACHED
If set and there is a need to start the server it will be started as a
background process. This flag is useful under W32 systems, so that no
new console is created and pops up a console window when starting the
server. On W32CE systems this flag is ignored.
@end table
@item pid_t (*waitpid) (assuan_context_t ctx, pid_t pid, int action, int *status, int options)
This is the function called by @sc{Assuan} to wait for the spawned
child process @var{pid} to exit, or, if @var{action} is 1, to just
release all resources associated with @var{pid} (required on Windows
platforms). If @var{action} is 0, this is equivalent to @code{waitpid}.
@item int (*socketpair) (assuan_context_t ctx, int namespace, int style, int protocol, assuan_fd_t filedes[2])
This is the function called by @sc{Assuan} to create a socketpair. It
is equivalent to @code{socketpair}.
@end table
@end deftp
@deftypefun void assuan_set_system_hooks (@w{assuan_system_hooks_t @var{system_hooks}})
Set the default system hooks to use. There is currently no way to
reset to the default system hooks.
@end deftypefun
+@deftypefun void assuan_sock_set_system_hooks (@w{assuan_system_hooks_t @var{system_hooks}})
+The socket subsystem uses an internal context which uses the default
+system hooks. This function allows to change these system hooks. The
+function is not thread-safe and only useful if a certain order of
+assuan and assuan socket initializations are required.
+@end deftypefun
+
@deftypefun void assuan_ctx_set_system_hooks (@w{assuan_context_t @var{ctx}}, @w{assuan_system_hooks_t @var{system_hooks}})
Set the system hooks for context @var{ctx}. There is currently no way
to reset to the default system hooks, create a new context for that.
@end deftypefun
+
The following system hook collections are defined by the library for
your convenience:
@table @code
@item ASSUAN_SYSTEM_NPTH
System hooks suitable for use with the nPth library.
@item ASSUAN_SYSTEM_NPTH_IMPL
The implementation of system hooks for use with the nPth library.
This must be invoked once somewhere in the application, and defines
the structure that is referenced by @code{ASSUAN_SYSTEM_NPTH}.
@item ASSUAN_SYSTEM_PTH
System hooks suitable for use with the GNU Pth library.
@item ASSUAN_SYSTEM_PTH_IMPL
The implementation of system hooks for use with the GNU Pth library.
This must be invoked once somewhere in the application, and defines
the structure that is referenced by @code{ASSUAN_SYSTEM_PTH}.
@end table
@node Reading and Writing
@section How to communicate with the peer
What would be an IPC library without the ability to read and write
data? Not very useful. Libassuan has high level functions to take
care of of the more boring stuff, but eventually data needs to be
written and read.
@noindent
The basic read and write functions are:
@deftypefun gpg_error_t assuan_read_line (@w{assuan_context_t @var{ctx}}, @w{char **@var{line}}, @w{size_t *@var{linelen}})
Read the next line written by the peer to the control channel and store
a pointer to the buffer holding that line at the address @var{line}.
The valid length of the lines is stored at the address of @var{linelen}.
This buffer is valid until the next read operation on the same context
@var{ctx}. You may modify the context of this buffer. The buffer is
invalid (i.e. must not be used) if an error is returned. This function
returns @code{0} on success or an error value.
@end deftypefun
@deftypefun gpg_error_t assuan_write_line (@w{assuan_context_t @var{ctx}}, @w{const char *@var{line}})
Write the string @var{line} to the other end on the control channel.
This string needs to be a proper formatted Assuan protocol line and
should not include a linefeed. Sending linefeed or @code{Nul}
characters is not possible and not allowed by the assuan protocol. This
function shall not be used for sending data (@code{D}) lines. This
function returns @code{0} on success or an error value.
@end deftypefun
@noindent
To actually send bulk data lines a specialized function is available:
@deftypefun gpg_error_t assuan_send_data (@w{assuan_context_t @var{ctx}}, @w{const void *@var{buffer}}, @w{size_t @var{length}})
This function is used by a server or a client to send @var{length} bytes
of bulk data in @var{buffer} to the other end on the control channel.
The data will be escaped as required by the Assuan protocol and may get
buffered until a line is full. To flush any pending data, @var{buffer}
may be passed as @code{NULL} and @var{length} be @code{0}.
@noindent
When used by a client, this flush operation does also send the
@code{END} command to terminate the response on an @command{INQUIRE}
request. Note that the function @code{assuan_transact} takes care of
sending this @code{END} itself.
@noindent
This function returns @code{0} on success or an error value.
@end deftypefun
The input and output of data can be controlled at a higher level using
an I/O monitor.
@deftp {Data type} {unsigned int (*assuan_io_monitor_t) (@w{assuan_context_t @var{ctx}}, @w{void *@var{hook_value}}, @w{int @var{inout}}, @w{const char *@var{line}}, @w{size_t @var{linelen}})}
The monitor function is called right after a line has been received,
if @var{inout} is @code{ASSUAN_IO_FROM_PEER}, or just before it is
send, if @var{inout} is @code{ASSUAN_IO_TO_PEER}. The
@var{hook_value} is provided by the user when registering the I/O
monitor function with a context using @code{assuan_set_io_monitor}.
The callback function should return the bitwise OR of some (or none) of the
following flags:
@table @code
@item ASSUAN_IO_MONITOR_NOLOG
Active logging of this line is suppressed. This can reduce debug
output in the case of a frequent message.
@item ASSUAN_IO_MONITOR_IGNORE
The whole output line is discarded.
@end table
@end deftp
@deftypefun void assuan_set_io_monitor (@w{assuan_context_t @var{ctx}}, @w{assuan_io_monitor_t @var{io_monitor}}, @w{void *@var{hook_data}})
This function registers an I/O monitor @var{io_monitor} for the
context @var{ctx} with the hook value @var{hook_data}.
@end deftypefun
@c
@c C L I E N T C O D E
@c
@node Client code
@chapter How to develop an Assuan client
Depending on the type of the server you want to connect you need to use
different functions.
If the peer is not a simple pipe server but one using full-duplex
sockets, the full-fledged variant of the above function should be
used:
@deftypefun gpg_error_t assuan_pipe_connect (@w{assuan_context_t @var{ctx}},@w{const char *@var{name}}, @w{const char *@var{argv}[]}, @w{assuan_fd_t *@var{fd_child_list}}, @w{void (*@var{atfork}) (void *, int)}, @w{void *@var{atforkvalue}}, @w{unsigned int @var{flags}})
A call to this functions forks the current process and executes the
program @var{name}, passing the arguments given in the NULL-terminated
list @var{argv}. A list of file descriptors not to be closed may be
given using the @code{ASSUAN_INVALID_FD} terminated array @var{fd_child_list}.
If @var{name} is a null pointer, only a fork but no exec is done. Thus
the child continues to run. However all file descriptors are closed and
some special environment variables are set. To let the caller detect
whether the child or the parent continues, the parent returns with
@code{"client"} returned in @var{argv} and the child returns with
@code{"server"} in @var{argv}. This feature is only available on POSIX
platforms.
If @var{atfork} is not NULL, this function is called in the child right
after the fork and the value @var{atforkvalue} is passed as the first
argument. That function should only act if the second argument it
received is @code{0}. Such a fork callback is useful to release
additional resources not to be used by the child.
@noindent
@var{flags} is a bit vector and controls how the function acts:
@table @code
@item ASSUAN_PIPE_CONNECT_FDPASSING
If cleared a simple pipe based server is expected. If set a server
based on full-duplex pipes is expected. Such pipes are usually
created using the @code{socketpair} function. It also enables
features only available with such servers.
@item ASSUAN_PIPE_CONNECT_DETACHED
If set and there is a need to start the server it will be started as a
background process. This flag is useful under W32 systems, so that no
new console is created and pops up a console window when starting the
server. On W32CE systems this flag is ignored.
@end table
@end deftypefun
If you are using a long running server listening either on a TCP or a
Unix domain socket, the following function is used to connect to the server:
@deftypefun gpg_error_t assuan_socket_connect (@w{assuan_context_t @var{ctx}}, @w{const char *@var{name}}, @w{pid_t @var{server_pid}}, @w{unsigned int @var{flags}})
Make a connection to the Unix domain socket @var{name} using the
already-initialized Assuan context at @var{ctx}. @var{server_pid} is
currently not used but may become handy in the future; if you don't
know the server's process ID (PID), pass @code{ASSUAN_INVALID_PID}.
With @var{flags} set to @code{ASSUAN_SOCKET_CONNECT_FDPASSING},
@code{sendmsg} and @code{recvmesg} are used for input and output and
thereby enable the use of descriptor passing.
Connecting to a TCP server is not yet implemented. Standard URL
schemes are reserved for @var{name} specifying a TCP server.
@end deftypefun
Now that we have a connection to the server, all work may be
conveniently done using a couple of callbacks and the transact
function:
@deftypefun gpg_error_t assuan_transact (@w{assuan_context_t @var{ctx}}, @w{const char *@var{command}}, @w{gpg_error_t (*@var{data_cb})(void *, const void *, size_t)}, @w{void *@var{data_cb_arg}}, @w{gpg_error_t (*@var{inquire_cb})(void*, const char *)}, @w{void *@var{inquire_cb_arg}}, @w{gpg_error_t (*@var{status_cb})(void*, const char *)}, @w{void *@var{status_cb_arg}})
Here @var{ctx} is the Assuan context opened by one of the connect
calls. @var{command} is the actual Assuan command string. It
shall not end with a line feed and its length is limited to
@code{ASSUAN_LINELENGTH} (~1000 bytes)
@var{data_cb} is called by Libassuan for data lines; @var{data_cb_arg}
is passed to it along with the data and the length. [FIXME: needs
more documentation].
@var{inquire_cb} is called by Libassuan when the server requests
additional information from the client while processing the command.
This callback shall check the provided inquiry name and send the data
as requested back using the @code{assuan_send_data}. The server
passed @var{inquiry_cb_arg} along with the inquiry name to the
callback.
@var{status_cb} is called by Libassuan for each status line it receives
from the server. @var{status_cb_arg} is passed along with the status
line to the callback.
The function returns @code{0} success or an error value. The error value
may be the one one returned by the server in error lines or one
generated by the callback functions.
@end deftypefun
Libassuan supports descriptor passing on some platforms. The next two
functions are used with this feature:
@anchor{function assuan_sendfd}
@deftypefun gpg_error_t assuan_sendfd (@w{assuan_context_t @var{ctx}}, @w{assuan_fd_t @var{fd}})
Send the descriptor @var{fd} to the peer using the context @var{ctx}.
The descriptor must be sent before the command is issued that makes
use of the descriptor.
Note that calling this function with a @var{ctx} of @code{NULL} and
@var{fd} of @code{ASSUAN_INVALID_FD} can be used as a runtime test to
check whether descriptor passing is available on the platform:
@code{0} is returned if descriptor passing is available, otherwise an
error with the error code @code{GPG_ERR_NOT_IMPLEMENTED} is returned.
@end deftypefun
@anchor{function assuan_receivefd}
@deftypefun gpg_error_t assuan_receivefd (@w{assuan_context_t @var{ctx}}, @w{assuan_fd_t *@var{fd}})
Receive a descriptor pending for the context @var{ctx} from the peer.
The descriptor must be pending before this function is called. To
accomplish this, the peer needs to use @code{assuan_sendfd} before the
trigger is sent (e.g. using @code{assuan_write_line ("INPUT FD")}.
@end deftypefun
@c
@c S E R V E R C O D E
@c
@node Server code
@chapter How to develop an Assuan server
Implementing a server for Assuan is a bit more complex than a client.
However, it is a straightforward task we are going to explain using a
commented example.
@noindent
The list of the implemented server commands is defined by a table like:
@smallexample
static struct @{
const char *name;
int (*handler) (assuan_context_t, char *line);
@} command_table[] = @{
@{ "FOO", cmd_foo @},
@{ "BAR", cmd_bar @},
@{ "INPUT", NULL @},
@{ "OUTPUT", NULL @},
@{ NULL @}@};
@end smallexample
For convenience this table is usually put after the actual command
handlers (@code{cmd_foo}, @code{cmd_bar}) or even put inside
@code{command_handler} (see below). Note that the commands
@code{INPUT} and @code{OUTPUT} do not require a handler because
Libassuan provides a default handler for them. It is however possible
to assign a custom handler.
A prerequisite for this example code is that a client has already
connected to the server. Often there are two modes combined in one
program: A pipe-based server, where a client has forked the server
process, or a Unix domain socket based server that is listening on the
socket.
@example
void
command_handler (int fd)
@{
gpg_error_t rc;
int i;
assuan_context_t ctx;
rc = assuan_new (&ctx);
if (rc)
@{
fprintf (stderr, "server context creation failed: %s\n",
gpg_strerror(rc));
return;
@}
if (fd == -1)
@{
assuan_fd_t filedes[2];
filedes[0] = assuan_fd_from_posix_fd (0);
filedes[1] = assuan_fd_from_posix_fd (1);
rc = assuan_init_pipe_server (ctx, filedes);
@}
else
rc = assuan_init_socket_server (ctx, fd, ASSUAN_SOCKET_SERVER_ACCEPTED);
if (rc)
@{
fprintf (stderr, "server init failed: %s\n", gpg_strerror (rc));
return;
@}
@end example
@noindent
This is the first part of the command handler. We start off by
allocating a new Assuan context with @code{assuan_new}.
@xref{function assuan_new}.
In case this is called as a pipe based server, @var{fd} will be based
as @var{fd} and the code assumes that the server's @code{stdin} and
@code{stdout} file handles are connected to a pipe. The
initialization is thus done using the function:
@deftypefun gpg_error_t assuan_init_pipe_server (@w{assuan_context_t @var{ctx}}, @w{assuan_fd_t @var{filedes}[2]})
This function takes the two file descriptors from @var{filedes} and
returns a new Assuan context at @var{r_ctx}. As usual, a return value
of @code{0} indicates success and a failure is indicated by
returning an error value. In case of error, @code{NULL} will be stored
at @var{r_ctx}.
In case the server has been called using a bi-directional pipe
(socketpair), @var{filedes} is ignored and the file descriptor is
taken from the environment variable @env{_assuan_connection_fd}. You
generally don't need to know this, because @code{assuan_pipe_connect},
which is called by the client to connect to such a server,
automagically sets this variable.
@end deftypefun
@deftypefun gpg_error_t assuan_init_socket_server (@w{assuan_context_t @var{ctx}}, @w{assuan_fd_t @var{fd}}, @w{unsigned int @var{flags}})
This function takes the file descriptor @var{fd}, which is expected to
be associated with a socket, and an Assuan context @var{ctx}. The
following bits are currently defined for @var{flags}:
@table @code
@item ASSUAN_SOCKET_SERVER_FDPASSING
If set, @code{sendmsg} and @code{recvmesg} are used for input and
output, which enables the use of descriptor passing.
@item ASSUAN_SOCKET_SERVER_ACCEPTED
If set, @var{fd} refers to an already accepted socket. That is,
Libassuan won't call @var{accept} for it. It is suggested to set this
bit as it allows better control of the connection state.
@end table
As usual, a return value of @code{0} indicates success and a failure
is indicated by returning an error value.
@end deftypefun
@noindent
On the Windows platform the following function needs to be called after
@code{assuan_init_socket_server}:
@deftypefun void assuan_set_sock_nonce ( @
@w{assuan_context_t @var{ctx}}, @
@w{assuan_sock_nonce_t *@var{nonce}})
Save a copy of @var{nonce} in context @var{ctx}. This should be used
to register the server's nonce with a context established by
@code{assuan_init_socket_server}. It is technically only needed for
Windows, but it does no harm to use it on other systems.
@end deftypefun
@noindent
After error checking, the implemented assuan commands are registered with
the server.
@example
for (i = 0; command_table[i].name; i++)
@{
rc = assuan_register_command (ctx,
command_table[i].name,
command_table[i].handler, NULL);
if (rc)
@{
fprintf (stderr, "register failed: %s\n", gpg_strerror (rc));
assuan_release (ctx);
return;
@}
@}
@end example
@deftp {Data type} {gpg_error_t (*assuan_handler_t) (@w{assuan_context_t @var{ctx}}, @w{char *@var{line}})}
This is the function invoked by @sc{Assuan} for various command
related callback functions. Some of these callback functions have a
different type, but most use @code{assuan_handler_t}.
@end deftp
@deftypefun gpg_error_t assuan_register_command (@w{assuan_context_t @var{ctx}}, @w{const char *@var{cmd_string}}, @w{assuan_handler_t @var{handler}}, @w{const char *@var{help_string}})
This registers the command named @var{cmd_string} with the Assuan
context @var{ctx}. @var{handler} is the function called by Libassuan
if this command is received from the client. @var{NULL} may be used
for @var{handler} to use a default handler (this only works with a few
pre-defined commands). Note that several default handlers have
already been registered when the context has been created: @code{NOP},
@code{CANCEL}, @code{OPTION}, @code{BYE}, @code{AUTH}, @code{RESET}
and @code{END}. It is possible, but not recommended, to override
these commands.
@var{help_string} is a help string that is used for automatic
documentation. It should contain a usage line followed by an empty
line and a complete description.
@end deftypefun
@deftypefun gpg_error_t assuan_register_post_cmd_notify (@w{assuan_context_t @var{ctx}}, @w{void (*@var{fnc})(assuan_context_t)}, @w{gpg_error_t @var{err}})
Register a function to be called right after a command has been
processed. @var{err} is the result code from the last internal assuan
operation and not the one returned by the handler. It may be used for
command-related cleanup.
@end deftypefun
@deftypefun gpg_error_t assuan_register_bye_notify (@w{assuan_context_t @var{ctx}}, @w{assuan_handler_t @var{handler}})
Register function @var{fnc} with context @var{ctx} to be called right
before the standard handler for the @code{BYE} command is being called.
@end deftypefun
@deftypefun gpg_error_t assuan_register_reset_notify (@w{assuan_context_t @var{ctx}}, @w{assuan_handler_t @var{handler}})
Register function @var{fnc} with context @var{ctx} to be called right
before the standard handler for the @code{RESET} command is being called.
@end deftypefun
@deftypefun gpg_error_t assuan_register_cancel_notify (@w{assuan_context_t @var{ctx}}, @w{assuan_handler_t @var{handler}})
Register function @var{fnc} with context @var{ctx} to be called right
before the standard handler for the @code{RESET} command is being called.
@end deftypefun
@deftypefun gpg_error_t assuan_register_option_handler (@w{assuan_context_t @var{ctx}}, @w{gpg_error_t (*@var{fnc})(assuan_context_t, const char*, const char*)})
Register function @var{fnc} with context @var{ctx} for processing
options. That function is being called with the context, the name and
the value of the option. Leading and trailing spaces are removed from
the name and the value. The optional leading two dashes of the name
are removed as well. If no value has been given, an empty string is
passed. The function needs to return @code{0} on success or an error
code.
@end deftypefun
@deftypefun gpg_error_t assuan_register_input_notify (@w{assuan_context_t @var{ctx}}, @w{assuan_handler_t @var{handler}})
Although the input function may be overridden with a custom handler, it
is often more convenient to use the default handler and to know whether
an @code{INPUT} command has been seen and successfully parsed. The second
argument passed to that function is the entire line. Because that line
has already been parsed when the function gets called, a file descriptor
set with the @code{INPUT} command may already be used. That file
descriptor is available by calling @code{assuan_get_input_fd}. If the
notification function returns an error, the input fd does not change.
@end deftypefun
@deftypefun gpg_error_t assuan_register_output_notify (@w{assuan_context_t @var{ctx}}, @w{assuan_handler_t @var{handler}})
Although the output function may be overridden with a custom handler, it
is often more convenient to use the default handler and to know whether
an @code{OUTPUT} command has been seen and successfully parsed. The second
argument passed to that function is the entire line. Because that line
has already been parsed when the function gets called, a file descriptor
set with the @code{OUTPUT} command may already be used. That file
descriptor is available by calling @code{assuan_get_output_fd}. If the
notification function returns an error, the output fd does not change.
@end deftypefun
@deftypefun gpg_error_t assuan_set_hello_line (@w{assuan_context_t @var{ctx}}, @w{const char *@var{line}})
This is not actually a register function but may be called also after
registering commands. It changes the ``Hello'' line, sent by the
server to the client as a first response, from a default string to the
string @var{line}. For logging purposes, it is often useful to use
such a custom hello line which may tell version numbers and such.
Linefeeds are allowed in this string, however, each line needs to be
shorter than the Assuan line length limit.
@end deftypefun
@noindent
Now that everything has been setup, we can start to process our
clients requests.
@example
for (;;)
@{
rc = assuan_accept (ctx);
if (rc == -1)
break;
else if (rc)
@{
fprintf (stderr, "accept problem: %s\n", gpg_strerror (rc));
break;
@}
rc = assuan_process (ctx);
if (rc)
@{
fprintf (stderr, "processing failed: %s\n", gpg_strerror (rc));
continue;
@}
@}
assuan_release (ctx);
@}
@end example
@noindent
For future extensibility and to properly detect the end of the
connection the core of the server should loop over the
accept and process calls.
@deftypefun gpg_error_t assuan_accept (@w{assuan_context_t @var{ctx}})
A call to this function cancel any existing connection and waits for a
connection from a client (that might be skipped, depending on the type
of the server). The initial handshake is performed which may include an
initial authentication or encryption negotiation. On success @code{0}
is returned. An error value will be returned if the connection could for
some reason not be established. An error code of @code{GPG_ERR_EOF} indicates
the end of the connection.
@end deftypefun
@deftypefun gpg_error_t assuan_process (@w{assuan_context_t @var{ctx}})
This function is used to handle the Assuan protocol after a connection
has been established using @code{assuan_accept}. It is the main
protocol handler responsible for reading the client commands and calling
the appropriate handlers. The function returns @code{0} on success or
an error value if something went seriously wrong. Error values from the
individual command handlers, i.e. operational error, are not seen here.
@end deftypefun
@noindent
That is all needed for the server code. You only need to come up with
the code for the individual command handlers. Take care that the line
passed to the command handlers is allocated statically within the
context and calls to Assuan functions may modify that line. You are
also allowed to modify that line which makes parsing much easier.
@c
@c E x t e r n a l I / O L o o p s
@c
@node External I/O Loop
@chapter How to use external I/O event loops
The above implementations of an Assuan client and server are
synchronous, insofar as the main routines block until a request or
client connection is completely processed. In some programs, for
example GUI applications, this is undesirable. Instead, Assuan
operations should be non-blocking, and the caller should be able to
poll all involved file descriptors to determine when the next Assuan
function can be invoked without blocking.
To make this possible, client and server have to adhere to some rules:
@itemize @bullet
@item
Either partner should always write full lines. If partial lines are
written, the remainder of the line should be sent without delay.
@item
Either partner should eagerly receive status messages. While
receiving and sending bulk data may be delayed, the status
communication channel is different: Both partners may send status
messages in blocking mode at any time the protocol allows them to send
such status messages. To ensure that these send operations do not
actually block the sender, the recipient must be ready to receive
without undue delay.
@item
If descriptor passing is used over a socket, the descriptor must be
sent after the corresponding command without undue delay.
@end itemize
Together, these restrictions allow to limit the need for asynchronous
I/O operations to bulk data and the inbound status file descriptor.
In addition to the above rules, client and server should adhere to the
following implementation guidelines.
@menu
* External I/O Loop Client:: External I/O event loops in the client.
* External I/O Loop Server:: External I/O event loops in the server.
@end menu
@node External I/O Loop Client
@section External I/O event loops in the client.
The reference implementation for using external I/O event loops in the
client is the GPGME library, which exports its own external I/O event
loop mechanism and utilizes the Assuan library transparently for the
user. The following steps document how GPGME achieves this.
@enumerate
@item
Before connecting, set up pipes for bulk data transfer (using the
INPUT/OUTPUT commands, for example). These are passed to the server
either by inheritance (using a pipe server) or by FD passing (using a
socket server).
@item
Then you need to connect to the server. GPGME uses a pipe server, so
it just spawns a server process, which is a non-blocking operation.
FIXME: Currently, using a client with external event loop over a
socket connection is not supported. It is easy to support (we just
need a variation of @code{assuan_socket_connect} which takes an
already connected socket FD and turns it into an Assuan context), so
if you need this let us know.
@item
After connecting, get the inbound status FD with
@code{assuan_get_active_fds} (the first one returned is the status
FD). This FD can be duplicated if it is convenient (GPGME does this
to be able to close this FD and associated callback handlers without
disrupting Assuan's internals).
@item
Then register the Assuan inbound status FD and all bulk data FDs with
the I/O event mechanism. In general, this requires setting up
callback handlers for these FDs and registering them with the main
event loop.
@item
When bulk data FDs become ready, you can simply perform the
corresponding read or write operations. When the inbound status FD
becomes ready, you can receive the next server line with
assuan_read_line().
@item
You should close and unregister the bulk data FDs when you wrote all
data (for outbound FDs) or receive an EOF (for inbound FDs). When you
receive an ERR from the server, or an OK for the final operation, you
can unregister the inbound status FD and call @code{assuan_release}.
@item
As noted above, all send operations on the outbound status FD are done
immediate with blocking. In GPGME, this has never caused any problems.
@item
The @code{INQUIRE} function can be handled in two ways: If the
requested data is immediately available, the client can just send the
data blockingly. If the requested data needs to be fetched from a
blocking source, a callback handler can be registered for the FD with
the main event loop. GPGME does not support the @code{INQUIRE}
function, so we do not have any practical experience with this.
@end enumerate
Currently, the client can not cancel a pending operation gracefully.
It can, however, disconnect from the server at any time. It is the
responsibility of the server to periodically send status messages to
the client to probe if the connection remains alive.
@node External I/O Loop Server
@section External I/O event loops in the server.
Currently, no Assuan server exists which uses external I/O event
loops. However, the following guidelines should lead to a usable
implementation:
@enumerate
@item
For socket servers: You can not use @code{assuan_accept}, so you
should just implement the bind/connect/listen/accept stage yourself.
You can register the listen FD with your main event loop, accept the
connection when it becomes ready, and finally call
@code{assuan_init_socket_server} with the final argument being
@code{ASSUAN_SOCKET_SERVER_ACCEPTED} to create an Assuan context for this
connection. This way you can also handle multiple connections in
parallel. The reference implementation for this approach is DirMngr.
For pipe servers: @code{assuan_init_pipe_server} creates an Assuan
context valid for the pipe FDs.
@item
Once you have a context for a single connection, you can get the
inbound status FD with @code{assuan_get_active_fds} (the first one
returned is the status FD). This FD can be duplicated if it is
convenient. Every time the inbound status FD is readable, you should
invoke the function @code{assuan_process_next} (see below) to process
the next incoming message. @code{assuan_process_next} processes as
many status lines as can be received by a single @code{read}
operation. When it returns, the inbound status FD may still be
readable, but Assuan does not check this.
The function @code{assuan_process_next} returns 0 if it can not make
progress reliably, and it returns true in @code{done} if the client
closed the connection. See below for more information on this
function.
@item
The command will be dispatched by @code{assuan_process_next} just as
with @code{assuan_process}, however, you will want to implement the
command handlers in such a way that they do not block. For example,
the command handler may just register the bulk data FDs with the main
event loop and return.
When the command is finished, irregardless if this happens directly in
the command handler or later, you must call @code{assuan_process_done}
with an appropriate error value (or 0 for success) to return an
appropriate status line to the client. You can do this at the end of
the command handler, for example by ending it with @code{return
assuan_process_done (error_code);}. Another possibility is to invoke
@code{assuan_process_done} from the place in the code which closes the
last active bulk FD registered with the main event loop for this
operation.
@end enumerate
It is not possible to use @code{assuan_inquire} in a command handler,
as this function blocks on receiving the inquired data from the
client. Instead, the asynchronous version @code{assuan_inquire_ext}
needs to be used (see below), which invokes a callback when the client
provided the inquired data. A typical usage would be for the command
handler to register a continuation with @code{assuan_inquire_ext} and
return 0. Eventually, the continuation would be invoked by
@code{assuan_process_next} when the client data arrived. The
continuation could complete the command and eventually call
@code{assuan_process_done}.
Cancellation is supported by returning an appropriate error value to
the client with @code{assuan_process_done}. For long running
operations, the server should send progress status messages to the
client in regular intervals to notice when the client disconnects.
@deftypefun gpg_error_t assuan_process_next (@w{assuan_context_t @var{ctx}}, @w{int *@var{done}})
This is the same as @code{assuan_process} but the caller has to
provide the outer loop. He should loop as long as the return code is
zero and @var{done} is false.
@end deftypefun
@deftypefun gpg_error_t assuan_process_done (@w{assuan_context_t @var{ctx}}, @w{gpg_error_t @var{rc}})
Finish a pending command and return the error code @var{rc} to the
client.
@end deftypefun
@deftypefun gpg_error_t assuan_inquire_ext (@w{assuan_context_t @var{ctx}}, @w{const char *@var{keyword}}, @w{size_t @var{maxlen}}, @w{gpg_error_t (*@var{cb}) (void *cb_data, gpg_error_t rc, unsigned char *buffer, size_t buffer_len)}, @w{void *@var{cb_data}})
This is similar to @code{assuan_inquire} but the caller has to provide
the outer loop (using @code{assuan_process_next}). The caller should
specify a continuation with @var{cb}, which receives @var{cb_data} as
its first argument, and the error value as well as the inquired data as
its remaining arguments.
@end deftypefun
@c
@c U T I L I T I E S
@c
@node Utilities
@chapter Utility functions
@noindent
There are a lot of helper functions to make writing Assuan code easier.
Some of these functions provide information not available with the
general functions.
@deftypefun gpg_error_t assuan_write_status (@w{assuan_context_t @var{ctx}}, @w{const char *@var{keyword}}, @w{const char *@var{text}})
This is a convenience function for a server to send a status line. You
need to pass it the @var{keyword} and the content of the status line in
@var{text}.
@end deftypefun
@deftypefun gpg_error_t assuan_inquire (@w{assuan_context_t @var{ctx}}, @w{const char *@var{keyword}}, @w{unsigned char **@var{r_buffer}}, @w{size_t *@var{r_length}}, @w{size_t @var{maxlen}})
A server may use this function to request specific data from a client.
This function sends an 'INQUIRE' command back to the client and
returns the client's response in a newly allocated buffer. You need
to pass at least the server's context (@var{ctx}) and a description of
the required data (@var{keyword}). All other parameters may be
@code{NULL} or @code{0}, but this is rarely useful.
On success the result is stored in a newly allocated buffer stored at
@var{r_buffer}. The length of the data is stored at @var{r_length}.
If @var{maxlen} has not been given as @code{0}, it specifies an upper
size limit of the expected data. If the client returns too much
data the function fails and an error with the error code
@code{GPG_ERR_ASS_TOO_MUCH_DATA} will be returned.
@end deftypefun
@deftypefun FILE* assuan_get_data_fp (@w{assuan_context_t @var{ctx}})
Return a stdio stream for the Assuan context @var{ctx}. This stream may
then be used for data output (assuan_write_data). The stream is valid
until the end of the current handler. Calling @code{fclose} for that stream is
not required. Assuan does all the buffering needed to insert the status
line as well as the required line wrapping and quoting for data lines.
This function is only available on systems supporting either
@code{funopen} or @code{fopencookie}. If it is not supported @code{NULL}
is returned and @code{errno} is set to @code{ENOSYS}.
@end deftypefun
@deftypefun gpg_error_t assuan_set_okay_line (@w{assuan_context_t @var{ctx}}, @w{const char *@var{line}})
Set the text used for the next @code{OK} response to @var{line}. This is
sometimes useful to send additional human readable information along
with the OK line. The string is automatically reset at the end of the
current handler.
@end deftypefun
@deftypefun gpg_error_t assuan_command_parse_fd (@w{assuan_context_t @var{ctx}}, @w{char *@var{line}}, @w{assuan_fd_t *@var{rfd}})
This is the core of the default @code{INPUT} and @code{OUTPUT}
handler. It may be used in custom commands as well to negotiate a
file descriptor. If @var{line} contains @code{FD=@var{n}}, it returns
@var{n} in @var{rfd} assuming a local file descriptor. If @var{line}
contains just @code{FD} it returns a file descriptor at @var{rfd};
this file descriptor needs to have been sent by the client right
before using @code{assuan_sendfd}.
On W32 systems the returned file descriptor is a system handle and not a
libc low level I/O file descriptor. Thus applications need to use
@code{_open_osfhandle} before they can pass this descriptor to standard
functions like @code{fdopen} or @code{dup}.
@end deftypefun
@deftypefun @w{const char *} assuan_get_command_name (@w{assuan_context_t @var{ctx}})
Return the name of the command currently processed by a handler.
The returned string is valid until the next call to an Assuan
function on the same context. Returns @code{NULL} if no handler is
executed or the command is not known.
@end deftypefun
@deftypefun assuan_fd_t assuan_get_input_fd (@w{assuan_context_t @var{ctx}})
Return the file descriptor sent by the client using the last @code{INPUT}
command. Returns @code{ASSUAN_INVALID_FD} if no file descriptor is available.
@end deftypefun
@deftypefun assuan_fd_t assuan_get_output_fd (@w{assuan_context_t @var{ctx}})
Return the file descriptor sent by the client using the last
@code{OUTPUT} command. Returns @code{ASSUAN_INVALID_FD} if no file descriptor is
available.
@end deftypefun
@deftypefun gpg_error_t assuan_close_input_fd (@w{assuan_context_t @var{ctx}})
Close the file descriptor set by the last @code{INPUT} command. This
function has the advantage over a simple @code{close} that it can do
some sanity checks and make sure that a following
@code{assuan_get_input_fd} won't return an already closed descriptor.
@end deftypefun
@deftypefun gpg_error_t assuan_close_output_fd (@w{assuan_context_t @var{ctx}})
Close the file descriptor set by the last @code{OUTPUT} command. This
function has the advantage over a simple @code{close} that it can do
some sanity checks and make sure that a following
@code{assuan_get_input_fd} won't return an already closed descriptor.
@end deftypefun
@deftypefun gpg_error_t assuan_set_error (@w{assuan_context_t @var{ctx}}, @w{gpg_error_t @var{err}}, @w{const char *@var{text}})
This is a helper to provide a more descriptive error text with @code{ERR}
lines. For this to work, the text needs to be stored in the context
@var{ctx} while still being in the command handler. This function is
commonly called this way
@smallexample
return assuan_set_error (ctx, err, "commands needs 5 arguments");
@end smallexample
The value @var{err} is passed through and thus the return value of the
command handler in the example. The provided text further explains
that error to humans.
@end deftypefun
@deftypefun pid_t assuan_get_pid (@w{assuan_context_t @var{ctx}})
This function returns the pid of the connected connected peer. If
that pid is not known @code{ASSUAN_INVALID_PID} is returned. Note
that it is not always possible to learn the pid of the other
process. For a pipe based server the client knows it instantly and a
mechanism is in place to let the server learn it. For socket based
servers the pid is only available on systems providing the
@code{SO_PEERCRED} socket option @footnote{to our knowledge only the
Linux kernel has this feature}.
@end deftypefun
@deftp {Data type} {assuan_peercred_t}
This structure is used to store the peer credentials. The available
members depend on the operating system.
@table @code
@item pid_t pid
The process ID of the peer.
@item uid_t uid
The user ID of the peer process.
@item gid_t gid
The group ID of the peer process.
@end table
@end deftp
@deftypefun gpg_error_t assuan_get_peercred (@w{assuan_context_t @var{ctx}}, @w{assuan_peercred_t *@var{peercred}})
Return user credentials of the peer. This will work only on certain
systems and only when connected over a socket. On success, a pointer
to the peer credentials is stored in @var{peercred}. The information
is only valid as long as the state of the connection is unchanged (at
least until the next assuan call to the same context).
As of now only the server is able to retrieve this information. Note,
that for getting the pid of the peer @code{assuan_get_pid} is usually
better suited.
@end deftypefun
@deftypefun int assuan_get_active_fds (@w{assuan_context_t @var{ctx}}, @w{int @var{what}}, @w{assuan_fd_t *@var{fdarray}}, @w{int @var{fdarraysize}})
Return all active file descriptors for the context @var{ctx}. This
function can be used to select on the file descriptors and to call
@code{assuan_process_next} if there is an active one. The first
descriptor in the array is the one used for the command connection.
Currently @var{what} needs to be @code{0} to return descriptors used for
reading, @code{1} will eventually be used to return descriptors used for
writing. @var{fdarray} is an array of integers provided by the caller;
@var{fdarraysize} gives the size of that array.
On success the number of active descriptors are returned. These active
descriptors are then stored in @var{fdarray}. On error @code{-1} is
returned; the most likely reason for this is a too small @var{fdarray}.
Note that on W32 systems the returned file descriptor is a system handle
and not a libc low level I/O file descriptor.
@end deftypefun
@deftypefun int assuan_pending_line (@w{assuan_context_t @var{ctx}})
A call to this function return true if a full line has been buffered and
thus an entire assuan line may be read without triggering any actual
I/O.
@end deftypefun
@c
@c S O C K E T W R A P P E R S
@c
@node Socket wrappers
@chapter Socket wrapper functions
@noindent
It is sometimes useful to support Unix domain sockets on Windows. To do
this in a portable way, Assuan provides a set of wrapper functions which
may be used on any system but will enhance Windows to support these
socket types. The actual implementation is based on local TCP sockets
and fully transparent for the client. Server code needs to utilize two
extra functions to check the permissions.
@deftypefun gpg_error_t assuan_sock_init (void)
Initialize the socket wrappers. Must be called once at startup if any
of the socket wrapper functions are used.
@end deftypefun
@deftypefun gpg_error_t assuan_sock_deinit (void)
Deinitialize the socket wrappers.
@end deftypefun
@deftypefun int assuan_sock_close (@w{assuan_fd_t @var{fd}})
Wrapper for close which does a closesocket on Windows if needed.
@end deftypefun
@deftypefun assuan_fd_t assuan_sock_new (@w{int @var{domain}}, @w{int @var{type}}, @w{int @var{proto}});
Wrapper around socket.
@end deftypefun
@deftypefun int assuan_sock_connect (@w{assuan_fd_t @var{sockfd}}, @
@w{struct sockaddr *@var{addr}}, @
@w{int @var{addrlen}})
Wrapper around connect. For Unix domain sockets under Windows this
function also does a write immediately after the the connect to send the
nonce as read from the socket's file. Under Unix this function check
whether the socket file is a redirection file and connects to the
redirected socket instead; see @code{assuan_sock_set_sockaddr_un} for
details on the redirection file format.
@end deftypefun
@deftypefun int assuan_sock_connect_byname (@w{const char * @var{host}}, @
@w{unsigned short @var{port}}, @
@w{int @var{reserved}}, @
@w{const char *@var{credentials}}, @
@w{unsigned int @var{flags}})
Directly connect to @var{port} on @var{host} given as a name. The
current implementation requires that @var{flags} has either
@code{ASSUAN_SOCK_SOCKS} or @code{ASSUAN_SOCK_TOR} set. On success a
new TCP STREAM socket is returned; on error @code{ASSUAN_INVALID_FD}
and ERRNO set. If @var{credentials} is not @code{NULL}, it is a
string used for password based SOCKS authentication. Username and
password are separated by a colon. @var{reserved} should be 0. To
test whether the proxy is available @var{host} and @var{port} may be
given as NULL/0: If the proxy is available the function returns a
valid socket which is in the state after credentials sub-negotiation.
The caller now knows that the SOCKS proxy is available and has been
authenticated; normally the caller closes the socket then.
@end deftypefun
@deftypefun int assuan_sock_bind ( @
@w{assuan_fd_t @var{sockfd}}, @
@w{struct sockaddr *@var{addr}}, @
@w{int @var{addrlen}})
Wrapper around bind. Under Windows this creates a file and writes the
port number and a random nonce to this file.
@end deftypefun
@deftypefun int assuan_sock_set_sockaddr_un ( @
@w{const char *@var{fname}}, @
@w{struct sockaddr *@var{addr}}, @
@w{int *@var{r_redirected}})
This is a helper function to initialize the Unix socket domain address
structure @var{addr} and store the file name @var{fname} there. If
@var{r_redirected} is not NULL the function checks whether @var{fname}
already exists, is a regular file, and not a socket. In that case
@var{fname} is read to see whether this is a redirection to a socket
file. If that is the case 1 is stored at @var{r_redirected}. If the
file does not look like a redirection file 0 will be stored there and
@var{fname} will be used in the regular way.
The format of a redirection file is
@example
%Assuan%
socket=@var{name}
@end example
With @var{name} being is the actual socket to use. No white spaces
are allowed, both lines must be terminated by a single linefeed, and
extra lines are not allowed. Environment variables are interpreted in
@var{name} if given in @code{$@{VAR@}} notation. No escape characters
are defined; if the string @code{$@{} shall be used in file name, an
environment variable with that content may be used. The length of the
redirection file is limited to 511 bytes which is more than sufficient
for any known implementation of Unix domain sockets.
@end deftypefun
@deftypefun int assuan_sock_get_nonce ( @
@w{struct sockaddr *@var{addr}}, @
@w{int @var{addrlen}}, @
@w{assuan_sock_nonce_t *@var{nonce}})
This is used by the server after a bind to return the random nonce. To
keep the code readable this may also be used on POSIX system.
@end deftypefun
@deftypefun int assuan_sock_check_nonce ( @
@w{assuan_fd_t @var{fd}}, @
@w{assuan_sock_nonce_t *@var{nonce}})
If the option @code{ASSUAN_SOCKET_SERVER_ACCEPTED} has been used,
Libassuan has no way to check the nonce of the server. Thus an explicit
check of the saved nonce using this function is required. If this
function fails the server should immediately drop the connection. This
function may not be used if Libassuan does the accept call itself
(i.e. @code{ASSUAN_SOCKET_SERVER_ACCEPTED} has not been used) because
in this case Libassuan calls this function internally. See also
@code{assuan_set_sock_nonce}.
Actually this mechanism is only required on Windows but for cleanness of
code it may be used on POSIX systems as well, where this function is
a nop.
@end deftypefun
To control certain properties of the wrapper two additional functions
are provided:
@deftypefun int assuan_sock_set_flag ( @
@w{assuan_fd_t @var{fd}}, @
@w{const char *@var{name}}, @
@w{int @var{value}})
Set the flags @var{name} for socket @var{fd} to @var{value}. See
below for a list of valid names. Returns 0 on success; on failure
sets ERRNO and returns -1.
@end deftypefun
@deftypefun int assuan_sock_get_flag ( @
@w{assuan_fd_t @var{fd}}, @
@w{const char *@var{name}}, @
@w{int *@var{r_value}})
Store the current value of the flag @var{name} for socket @var{fd} at
@var{r_value}. See below for a list of valid names. Returns 0 on
success; on failure sets ERRNO and returns -1.
@end deftypefun
The supported flags are:
@table @code
@item cygwin
This flag has an effect only on Windows. If the value is 1, the
socket is set into Cygwin mode so that Cygwin clients can connect to
such a socket. This flag needs to be set before a bind and should not
be changed during the lifetime of the socket. There is no need to set
this flag for connecting to a Cygwin style socket because no state is
required at the client. On non-Windows platforms setting this flag is
ignored, reading the flag always returns a value of 0.
@item tor-mode
@itemx socks
If @var{value} is 1 globally enable SOCKS5 mode for new connections
using IPv6 or IPv4. @var{fd} must be set to @code{ASSUAN_INVALID_FD} A
future extension may allow to disable SOCKS5 mode for a specified
socket but globally disabling SOCKS5 mode is not possible. Using the
flag ``tor-mode'' expects the SOCKS5 proxy to listen on port 9050, the
flag ``socks'' expects the proxy to listen on port 1080.
Connections to the loopback address are not routed though the SOCKS
proxy. UDP requests are not supported at all. The proxy will be
connected at address 127.0.0.1; an IPv6 connection to the proxy is not
yet supported.
@end table
@c ---------------------------------------------------------------------
@c Legal BS
@c ---------------------------------------------------------------------
@include lgpl.texi
@include gpl.texi
@c ---------------------------------------------------------------------
@c Indexes
@c ---------------------------------------------------------------------
@node Index
@unnumbered Index
@printindex cp
@c ---------------------------------------------------------------------
@c Epilogue
@c ---------------------------------------------------------------------
@bye
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index adcd40a..7fb2201 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -1,1497 +1,1504 @@
/* assuan-socket.c - Socket wrapper
* Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc.
* Copyright (C) 2001-2015 g10 Code GmbH
*
* This file is part of Assuan.
*
* 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.
*
* 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.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see .
* SPDX-License-Identifier: LGPL-2.1+
*/
#ifdef HAVE_CONFIG_H
#include
#endif
#include
#include
#ifdef HAVE_W32_SYSTEM
# define WIN32_LEAN_AND_MEAN
# include
# include
#ifndef HAVE_W32CE_SYSTEM
# include
#endif
#else
# include
# include
# include
# include
#endif
#include
#ifdef HAVE_SYS_STAT_H
# include
#endif
#ifdef HAVE_FCNTL_H
#include
#endif
#include
#include "assuan-defs.h"
#include "debug.h"
/* 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
#ifdef HAVE_W32_SYSTEM
#ifndef S_IRUSR
# define S_IRUSR 0
# define S_IWUSR 0
#endif
#ifndef S_IRGRP
# define S_IRGRP 0
# define S_IWGRP 0
#endif
#ifndef ENOTSUP
#define ENOTSUP 129
#endif
#ifndef EPROTO
#define EPROTO 134
#endif
#ifndef EPROTONOSUPPORT
#define EPROTONOSUPPORT 135
#endif
#ifndef ENETDOWN
#define ENETDOWN 116
#endif
#ifndef ENETUNREACH
#define ENETUNREACH 118
#endif
#ifndef EHOSTUNREACH
#define EHOSTUNREACH 110
#endif
#ifndef ECONNREFUSED
#define ECONNREFUSED 107
#endif
#ifndef ETIMEDOUT
#define ETIMEDOUT 138
#endif
#endif
#ifndef ENAMETOOLONG
# define ENAMETOOLONG EINVAL
#endif
#ifndef SUN_LEN
# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
+ strlen ((ptr)->sun_path))
#endif
#ifndef INADDR_LOOPBACK
# define INADDR_LOOPBACK ((in_addr_t) 0x7f000001) /* 127.0.0.1. */
#endif
/* The standard SOCKS and TOR port. */
#define SOCKS_PORT 1080
#define TOR_PORT 9050
#define TOR_PORT2 9150 /* The Tor browser is listening there. */
/* In the future, we can allow access to sock_ctx, if that context's
hook functions need to be overridden. There can only be one global
assuan_sock_* user (one library or one application) with this
convenience interface, if non-standard hook functions are
needed. */
static assuan_context_t sock_ctx;
/* This global flag can be set using assuan_sock_set_flag to enable
TOR or SOCKS mode for all sockets. It may not be reset. The value
is the port to be used. */
static unsigned short tor_mode;
#ifdef HAVE_W32_SYSTEM
/* A table of active Cygwin connections. This is only used for
listening socket which should be only a few. We do not enter
sockets after a connect into this table. */
static assuan_fd_t cygwin_fdtable[16];
/* A critical section to guard access to the table of Cygwin
connections. */
static CRITICAL_SECTION cygwin_fdtable_cs;
/* Return true if SOCKFD is listed as Cygwin socket. */
static int
is_cygwin_fd (assuan_fd_t sockfd)
{
int ret = 0;
int i;
EnterCriticalSection (&cygwin_fdtable_cs);
for (i=0; i < DIM(cygwin_fdtable); i++)
{
if (cygwin_fdtable[i] == sockfd)
{
ret = 1;
break;
}
}
LeaveCriticalSection (&cygwin_fdtable_cs);
return ret;
}
/* Insert SOCKFD into the table of Cygwin sockets. Return 0 on
success or -1 on error. */
static int
insert_cygwin_fd (assuan_fd_t sockfd)
{
int ret = 0;
int mark = -1;
int i;
EnterCriticalSection (&cygwin_fdtable_cs);
for (i=0; i < DIM(cygwin_fdtable); i++)
{
if (cygwin_fdtable[i] == sockfd)
goto leave; /* Already in table. */
else if (cygwin_fdtable[i] == ASSUAN_INVALID_FD)
mark = i;
}
if (mark == -1)
{
gpg_err_set_errno (EMFILE);
ret = -1;
}
else
cygwin_fdtable[mark] = sockfd;
leave:
LeaveCriticalSection (&cygwin_fdtable_cs);
return ret;
}
/* Delete SOCKFD from the table of Cygwin sockets. */
static void
delete_cygwin_fd (assuan_fd_t sockfd)
{
int i;
EnterCriticalSection (&cygwin_fdtable_cs);
for (i=0; i < DIM(cygwin_fdtable); i++)
{
if (cygwin_fdtable[i] == sockfd)
{
cygwin_fdtable[i] = ASSUAN_INVALID_FD;
break;
}
}
LeaveCriticalSection (&cygwin_fdtable_cs);
return;
}
#ifdef HAVE_W32CE_SYSTEM
static wchar_t *
utf8_to_wchar (const char *string)
{
int n;
size_t nbytes;
wchar_t *result;
if (!string)
return NULL;
n = MultiByteToWideChar (CP_UTF8, 0, string, -1, NULL, 0);
if (n < 0)
return NULL;
nbytes = (size_t)(n+1) * sizeof(*result);
if (nbytes / sizeof(*result) != (n+1))
{
SetLastError (ERROR_INVALID_PARAMETER);
return NULL;
}
result = malloc (nbytes);
if (!result)
return NULL;
n = MultiByteToWideChar (CP_UTF8, 0, string, -1, result, n);
if (n < 0)
{
n = GetLastError ();
free (result);
result = NULL;
SetLastError (n);
}
return result;
}
static HANDLE
MyCreateFile (LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwSharedMode,
LPSECURITY_ATTRIBUTES lpSecurityAttributes,
DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes,
HANDLE hTemplateFile)
{
wchar_t *filename;
HANDLE result;
int err;
filename = utf8_to_wchar (lpFileName);
if (!filename)
return INVALID_HANDLE_VALUE;
result = CreateFileW (filename, dwDesiredAccess, dwSharedMode,
lpSecurityAttributes, dwCreationDisposition,
dwFlagsAndAttributes, hTemplateFile);
err = GetLastError ();
free (filename);
SetLastError (err);
return result;
}
static int
MyDeleteFile (LPCSTR lpFileName)
{
wchar_t *filename;
int result, err;
filename = utf8_to_wchar (lpFileName);
if (!filename)
return 0;
result = DeleteFileW (filename);
err = GetLastError ();
free (filename);
SetLastError (err);
return result;
}
#else /*!HAVE_W32CE_SYSTEM*/
#define MyCreateFile CreateFileA
#define MyDeleteFile DeleteFileA
#endif /*!HAVE_W32CE_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;
case WSAECONNREFUSED:
return ECONNREFUSED;
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)) )
gpg_err_set_errno (ENODEV);
else
{
if (!CryptGenRandom (prov, nbytes, (unsigned char *) buffer))
gpg_err_set_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. If FNAME has a Cygwin socket
descriptor True is stored at CYGWIN. */
static int
read_port_and_nonce (const char *fname, unsigned short *port, char *nonce,
int *cygwin)
{
FILE *fp;
char buffer[50], *p;
size_t nread;
int aval;
*cygwin = 0;
fp = fopen (fname, "rb");
if (!fp)
return -1;
nread = fread (buffer, 1, sizeof buffer - 1, fp);
fclose (fp);
if (!nread)
{
gpg_err_set_errno (ENOENT);
return -1;
}
buffer[nread] = 0;
if (!strncmp (buffer, "!", 10))
{
/* This is the Cygwin compatible socket emulation. The format
* of the file is:
*
* "!%u %c %08x-%08x-%08x-%08x\x00"
*
* %d for port number, %c for kind of socket (s for STREAM), and
* we have 16-byte random bytes for nonce. We only support
* stream mode.
*/
unsigned int u0;
int narr[4];
if (sscanf (buffer+10, "%u s %08x-%08x-%08x-%08x",
&u0, narr+0, narr+1, narr+2, narr+3) != 5
|| u0 < 1 || u0 > 65535)
{
gpg_err_set_errno (EINVAL);
return -1;
}
*port = u0;
memcpy (nonce, narr, 16);
*cygwin = 1;
}
else
{
/* This is our own socket emulation. */
aval = atoi (buffer);
if (aval < 1 || aval > 65535)
{
gpg_err_set_errno (EINVAL);
return -1;
}
*port = (unsigned int)aval;
for (p=buffer; nread && *p != '\n'; p++, nread--)
;
if (*p != '\n' || nread != 17)
{
gpg_err_set_errno (EINVAL);
return -1;
}
p++; nread--;
memcpy (nonce, p, 16);
}
return 0;
}
#endif /*HAVE_W32_SYSTEM*/
#ifndef HAVE_W32_SYSTEM
/* Find a redirected socket name for fname and return a malloced setup
filled sockaddr. If this does not work out NULL is returned and
ERRNO is set. If the file seems to be a redirect True is stored at
R_REDIRECT. Note that this function uses the standard malloc and
not the assuan wrapped one. The format of the file is:
%Assuan%
socket=NAME
where NAME is the actual socket to use. No white spaces are
allowed, both lines must be terminated by a single LF, extra lines
are not allowed. Environment variables are interpreted in NAME if
given in "${VAR} notation; no escape characters are defined, if
"${" shall be used verbatim, you need to use an environment
variable with that content.
The use of an absolute NAME is strongly suggested. The length of
the file is limited to 511 bytes which is more than sufficient for
that common value of 107 for sun_path. */
static struct sockaddr_un *
eval_redirection (const char *fname, int *r_redirect)
{
FILE *fp;
char buffer[512], *name;
size_t n;
struct sockaddr_un *addr;
char *p, *pend;
const char *s;
*r_redirect = 0;
fp = fopen (fname, "rb");
if (!fp)
return NULL;
n = fread (buffer, 1, sizeof buffer - 1, fp);
fclose (fp);
if (!n)
{
gpg_err_set_errno (ENOENT);
return NULL;
}
buffer[n] = 0;
/* Check that it is a redirection file. We also check that the
first byte of the name is not a LF because that would lead to an
zero length name. */
if (n < 17 || buffer[n-1] != '\n'
|| memcmp (buffer, "%Assuan%\nsocket=", 16)
|| buffer[16] == '\n')
{
gpg_err_set_errno (EINVAL);
return NULL;
}
buffer[n-1] = 0;
name = buffer + 16;
*r_redirect = 1;
addr = calloc (1, sizeof *addr);
if (!addr)
return NULL;
addr->sun_family = AF_LOCAL;
n = 0;
for (p=name; *p; p++)
{
if (*p == '$' && p[1] == '{')
{
p += 2;
pend = strchr (p, '}');
if (!pend)
{
free (addr);
gpg_err_set_errno (EINVAL);
return NULL;
}
*pend = 0;
if (*p && (s = getenv (p)))
{
for (; *s; s++)
{
if (n < sizeof addr->sun_path - 1)
addr->sun_path[n++] = *s;
else
{
free (addr);
gpg_err_set_errno (ENAMETOOLONG);
return NULL;
}
}
}
p = pend;
}
else if (*p == '\n')
break; /* Be nice and stop at the first LF. */
else if (n < sizeof addr->sun_path - 1)
addr->sun_path[n++] = *p;
else
{
free (addr);
gpg_err_set_errno (ENAMETOOLONG);
return NULL;
}
}
return addr;
}
#endif /*!HAVE_W32_SYSTEM*/
/* 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
_assuan_sock_new (assuan_context_t ctx, int domain, int type, int proto)
{
#ifdef HAVE_W32_SYSTEM
assuan_fd_t res;
if (domain == AF_UNIX || domain == AF_LOCAL)
domain = AF_INET;
res = SOCKET2HANDLE(_assuan_socket (ctx, domain, type, proto));
return res;
#else
return _assuan_socket (ctx, domain, type, proto);
#endif
}
int
_assuan_sock_set_flag (assuan_context_t ctx, assuan_fd_t sockfd,
const char *name, int value)
{
(void)ctx;
if (!strcmp (name, "cygwin"))
{
#ifdef HAVE_W32_SYSTEM
if (!value)
delete_cygwin_fd (sockfd);
else if (insert_cygwin_fd (sockfd))
return -1;
#else
/* Setting the Cygwin flag on non-Windows is ignored. */
#endif
}
else if (!strcmp (name, "tor-mode") || !strcmp (name, "socks"))
{
/* If SOCKFD is ASSUAN_INVALID_FD this controls global flag to
switch AF_INET and AF_INET6 into TOR mode by using a SOCKS5
proxy on localhost:9050. It may only be switched on and this
needs to be done before any new threads are started. Once
TOR mode has been enabled, TOR mode can be disabled for a
specific socket by using SOCKFD with a VALUE of 0. */
if (sockfd == ASSUAN_INVALID_FD)
{
if (tor_mode && !value)
{
gpg_err_set_errno (EPERM);
return -1; /* Clearing the global flag is not allowed. */
}
else if (value)
{
if (*name == 's')
tor_mode = SOCKS_PORT;
else
tor_mode = TOR_PORT;
}
}
else if (tor_mode && sockfd != ASSUAN_INVALID_FD)
{
/* Fixme: Disable/enable tormode for the given context. */
}
else
{
gpg_err_set_errno (EINVAL);
return -1;
}
}
else
{
gpg_err_set_errno (EINVAL);
return -1;
}
return 0;
}
int
_assuan_sock_get_flag (assuan_context_t ctx, assuan_fd_t sockfd,
const char *name, int *r_value)
{
(void)ctx;
if (!strcmp (name, "cygwin"))
{
#ifdef HAVE_W32_SYSTEM
*r_value = is_cygwin_fd (sockfd);
#else
*r_value = 0;
#endif
}
else if (!strcmp (name, "tor-mode"))
{
/* FIXME: Find tor-mode for the given socket. */
*r_value = tor_mode == TOR_PORT;
}
else if (!strcmp (name, "socks"))
{
*r_value = tor_mode == SOCKS_PORT;
}
else
{
gpg_err_set_errno (EINVAL);
return -1;
}
return 0;
}
/* Read NBYTES from SOCKFD into BUFFER. Return 0 on success. Handle
EAGAIN and EINTR. */
static int
do_readn (assuan_context_t ctx, assuan_fd_t sockfd,
void *buffer, size_t nbytes)
{
char *p = buffer;
ssize_t n;
while (nbytes)
{
n = _assuan_read (ctx, sockfd, p, nbytes);
if (n < 0 && errno == EINTR)
;
else if (n < 0 && errno == EAGAIN)
_assuan_usleep (ctx, 100000); /* 100ms */
else if (n < 0)
return -1;
else if (!n)
{
gpg_err_set_errno (EIO);
return -1;
}
else
{
p += n;
nbytes -= n;
}
}
return 0;
}
/* Write NBYTES from BUFFER to SOCKFD. Return 0 on success; on error
return -1 and set ERRNO. */
static int
do_writen (assuan_context_t ctx, assuan_fd_t sockfd,
const void *buffer, size_t nbytes)
{
int ret;
ret = _assuan_write (ctx, sockfd, buffer, nbytes);
if (ret >= 0 && ret != nbytes)
{
gpg_err_set_errno (EIO);
ret = -1;
}
else if (ret >= 0)
ret = 0;
return ret;
}
/* Connect using the SOCKS5 protocol. */
static int
socks5_connect (assuan_context_t ctx, assuan_fd_t sock,
unsigned short socksport,
const char *credentials,
const char *hostname, unsigned short hostport,
struct sockaddr *addr, socklen_t length)
{
int ret;
/* struct sockaddr_in6 proxyaddr_in6; */
struct sockaddr_in proxyaddr_in;
struct sockaddr *proxyaddr;
size_t proxyaddrlen;
struct sockaddr_in6 *addr_in6;
struct sockaddr_in *addr_in;
unsigned char buffer[22+512]; /* The extra 512 gives enough space
for username/password or the
hostname. */
size_t buflen, hostnamelen;
int method;
/* memset (&proxyaddr_in6, 0, sizeof proxyaddr_in6); */
memset (&proxyaddr_in, 0, sizeof proxyaddr_in);
/* Either HOSTNAME or ADDR may be given. */
if (hostname && addr)
{
gpg_err_set_errno (EINVAL);
return -1;
}
/* If a hostname is given it must fit into our buffer and it must be
less than 256 so that its length can be encoded in one byte. */
hostnamelen = hostname? strlen (hostname) : 0;
if (hostnamelen > 255)
{
gpg_err_set_errno (ENAMETOOLONG);
return -1;
}
/* Connect to local host. */
/* Fixme: First try to use IPv6 but note that
_assuan_sock_connect_byname created the socket with AF_INET. */
proxyaddr_in.sin_family = AF_INET;
proxyaddr_in.sin_port = htons (socksport);
proxyaddr_in.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
proxyaddr = (struct sockaddr *)&proxyaddr_in;
proxyaddrlen = sizeof proxyaddr_in;
ret = _assuan_connect (ctx, HANDLE2SOCKET (sock), proxyaddr, proxyaddrlen);
if (ret && socksport == TOR_PORT && errno == ECONNREFUSED)
{
/* Standard Tor port failed - try the Tor browser port. */
proxyaddr_in.sin_port = htons (TOR_PORT2);
ret = _assuan_connect (ctx, HANDLE2SOCKET (sock),
proxyaddr, proxyaddrlen);
}
/* If we get an EINPROGRESS here the caller is trying to do a
* non-blocking connect (e.g. for custom time out handling) which
* fails here. The easiest fix would be to allow the client to tell
* us the timeout value and we do the timeout handling later on in the
* Socks protocol. */
if (ret)
return ret;
buffer[0] = 5; /* RFC-1928 VER field. */
buffer[1] = 1; /* NMETHODS */
if (credentials)
method = 2; /* Method: username/password authentication. */
else
method = 0; /* Method: No authentication required. */
buffer[2] = method;
/* Negotiate method. */
ret = do_writen (ctx, sock, buffer, 3);
if (ret)
return ret;
ret = do_readn (ctx, sock, buffer, 2);
if (ret)
return ret;
if (buffer[0] != 5 || buffer[1] != method )
{
/* Socks server returned wrong version or does not support our
requested method. */
gpg_err_set_errno (ENOTSUP); /* Fixme: Is there a better errno? */
return -1;
}
if (credentials)
{
const char *password;
int ulen, plen;
password = strchr (credentials, ':');
if (!password)
{
gpg_err_set_errno (EINVAL); /* No password given. */
return -1;
}
ulen = password - credentials;
password++;
plen = strlen (password);
if (!ulen || ulen > 255 || !plen || plen > 255)
{
gpg_err_set_errno (EINVAL);
return -1;
}
buffer[0] = 1; /* VER of the sub-negotiation. */
buffer[1] = ulen;
buflen = 2;
memcpy (buffer+buflen, credentials, ulen);
buflen += ulen;
buffer[buflen++] = plen;
memcpy (buffer+buflen, password, plen);
buflen += plen;
ret = do_writen (ctx, sock, buffer, buflen);
wipememory (buffer, buflen);
if (ret)
return ret;
ret = do_readn (ctx, sock, buffer, 2);
if (ret)
return ret;
if (buffer[0] != 1)
{
/* SOCKS server returned wrong version. */
gpg_err_set_errno (EPROTONOSUPPORT);
return -1;
}
if (buffer[1])
{
/* SOCKS server denied access. */
gpg_err_set_errno (EACCES);
return -1;
}
}
if (hostname && !*hostname && !hostport)
{
/* Empty hostname given. Stop right here to allow the caller to
do the actual proxy request. */
return 0;
}
/* Send request details (rfc-1928, 4). */
buffer[0] = 5; /* VER */
buffer[1] = 1; /* CMD = CONNECT */
buffer[2] = 0; /* RSV */
if (hostname)
{
buffer[3] = 3; /* ATYP = DOMAINNAME */
buflen = 4;
buffer[buflen++] = hostnamelen;
memcpy (buffer+buflen, hostname, hostnamelen);
buflen += hostnamelen;
buffer[buflen++] = (hostport >> 8); /* DST.PORT */
buffer[buflen++] = hostport;
}
else if (addr->sa_family == AF_INET6)
{
addr_in6 = (struct sockaddr_in6 *)addr;
buffer[3] = 4; /* ATYP = IPv6 */
memcpy (buffer+ 4, &addr_in6->sin6_addr.s6_addr, 16); /* DST.ADDR */
memcpy (buffer+20, &addr_in6->sin6_port, 2); /* DST.PORT */
buflen = 22;
}
else
{
addr_in = (struct sockaddr_in *)addr;
buffer[3] = 1; /* ATYP = IPv4 */
memcpy (buffer+4, &addr_in->sin_addr.s_addr, 4); /* DST.ADDR */
memcpy (buffer+8, &addr_in->sin_port, 2); /* DST.PORT */
buflen = 10;
}
ret = do_writen (ctx, sock, buffer, buflen);
if (ret)
return ret;
ret = do_readn (ctx, sock, buffer, 10 /* Length for IPv4 */);
if (ret)
return ret;
if (buffer[0] != 5 || buffer[2] != 0 )
{
/* Socks server returned wrong version or the reserved field is
not zero. */
gpg_err_set_errno (EPROTONOSUPPORT);
return -1;
}
if (buffer[1])
{
switch (buffer[1])
{
case 0x01: /* General SOCKS server failure. */
gpg_err_set_errno (ENETDOWN);
break;
case 0x02: /* Connection not allowed by ruleset. */
gpg_err_set_errno (EACCES);
break;
case 0x03: /* Network unreachable */
gpg_err_set_errno (ENETUNREACH);
break;
case 0x04: /* Host unreachable */
gpg_err_set_errno (EHOSTUNREACH);
break;
case 0x05: /* Connection refused */
gpg_err_set_errno (ECONNREFUSED);
break;
case 0x06: /* TTL expired */
gpg_err_set_errno (ETIMEDOUT);
break;
case 0x08: /* Address type not supported */
gpg_err_set_errno (EPROTONOSUPPORT);
break;
case 0x07: /* Command not supported */
default:
gpg_err_set_errno (ENOTSUP); /* Fixme: Is there a better errno? */
}
return -1;
}
if (buffer[3] == 4)
{
/* ATYP indicates a v6 address. We need to read the remaining
12 bytes. */
ret = do_readn (ctx, sock, buffer+10, 12);
if (ret)
return ret;
}
/* FIXME: We have not way to store the actual address used by the
server. */
return 0;
}
/* Return true if SOCKS shall be used. This is the case if tor_mode
is enabled and the desired address is not the loopback
address. */
static int
use_socks (struct sockaddr *addr)
{
if (!tor_mode)
return 0;
else if (addr->sa_family == AF_INET6)
{
struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)addr;
const unsigned char *s;
int i;
s = (unsigned char *)&addr_in6->sin6_addr.s6_addr;
if (s[15] != 1)
return 1; /* Last octet is not 1 - not the loopback address. */
for (i=0; i < 15; i++, s++)
if (*s)
return 1; /* Non-zero octet found - not the loopback address. */
return 0; /* This is the loopback address. */
}
else if (addr->sa_family == AF_INET)
{
struct sockaddr_in *addr_in = (struct sockaddr_in *)addr;
if (*(unsigned char*)&addr_in->sin_addr.s_addr == 127)
return 0; /* Loopback (127.0.0.0/8) */
return 1;
}
else
return 0;
}
int
_assuan_sock_connect (assuan_context_t ctx, assuan_fd_t sockfd,
struct sockaddr *addr, int addrlen)
{
#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 cygwin;
int ret;
unaddr = (struct sockaddr_un *)addr;
if (read_port_and_nonce (unaddr->sun_path, &port, nonce, &cygwin))
return -1;
myaddr.sin_family = AF_INET;
myaddr.sin_port = htons (port);
myaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
/* 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;
ret = _assuan_connect (ctx, HANDLE2SOCKET(sockfd),
(struct sockaddr *)&myaddr, sizeof myaddr);
if (!ret)
{
/* Send the nonce. */
ret = do_writen (ctx, sockfd, nonce, 16);
if (!ret && cygwin)
{
char buffer[16];
/* The client sends the nonce back - not useful. We do
a dummy read. */
ret = do_readn (ctx, sockfd, buffer, 16);
if (!ret)
{
/* Send our credentials. */
int n = getpid ();
memcpy (buffer, &n, 4);
memset (buffer+4, 0, 4); /* uid = gid = 0 */
ret = do_writen (ctx, sockfd, buffer, 8);
if (!ret)
{
/* Receive credentials. We don't need them. */
ret = do_readn (ctx, sockfd, buffer, 8);
}
}
}
}
return ret;
}
else if (use_socks (addr))
{
return socks5_connect (ctx, sockfd, tor_mode,
NULL, NULL, 0, addr, addrlen);
}
else
{
return _assuan_connect (ctx, HANDLE2SOCKET (sockfd), addr, addrlen);
}
#else
# if HAVE_STAT
if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX)
{
struct sockaddr_un *unaddr;
struct stat statbuf;
int redirect, res;
unaddr = (struct sockaddr_un *)addr;
if (!stat (unaddr->sun_path, &statbuf)
&& !S_ISSOCK (statbuf.st_mode)
&& S_ISREG (statbuf.st_mode))
{
/* The given socket file is not a socket but a regular file.
We use the content of that file to redirect to another
socket file. This can be used to use sockets on file
systems which do not support sockets or if for example a
home directory is shared by several machines. */
unaddr = eval_redirection (unaddr->sun_path, &redirect);
if (unaddr)
{
res = _assuan_connect (ctx, sockfd, (struct sockaddr *)unaddr,
SUN_LEN (unaddr));
free (unaddr);
return res;
}
if (redirect)
return -1;
/* Continue using the standard connect. */
}
}
# endif /*HAVE_STAT*/
if (use_socks (addr))
{
return socks5_connect (ctx, sockfd, tor_mode,
NULL, NULL, 0, addr, addrlen);
}
else
{
return _assuan_connect (ctx, sockfd, addr, addrlen);
}
#endif
}
/* Connect to HOST specified as host name on PORT. The current
implementation requires that either the flags ASSUAN_SOCK_SOCKS or
ASSUAN_SOCK_TOR are given in FLAGS. On success a new socket is
returned; on error ASSUAN_INVALID_FD is returned and ERRNO set. If
CREDENTIALS is not NULL, it is a string used for password based
authentication. Username and password are separated by a colon.
RESERVED must be 0. By passing HOST and PORT as 0 the function can
be used to check for proxy availability: If the proxy is available
a socket will be returned which the caller should then close. */
assuan_fd_t
_assuan_sock_connect_byname (assuan_context_t ctx, const char *host,
unsigned short port, int reserved,
const char *credentials, unsigned int flags)
{
assuan_fd_t fd;
unsigned short socksport;
if ((flags & ASSUAN_SOCK_TOR))
socksport = TOR_PORT;
else if ((flags & ASSUAN_SOCK_SOCKS))
socksport = SOCKS_PORT;
else
{
gpg_err_set_errno (ENOTSUP);
return ASSUAN_INVALID_FD;
}
if (host && !*host)
{
/* Error out early on an empty host name. See below. */
gpg_err_set_errno (EINVAL);
return ASSUAN_INVALID_FD;
}
fd = _assuan_sock_new (ctx, AF_INET, SOCK_STREAM, 0);
if (fd == ASSUAN_INVALID_FD)
return fd;
/* For HOST being NULL we pass an empty string which indicates to
socks5_connect to stop midway during the proxy negotiation. Note
that we can't pass NULL directly as this indicates IP address
mode to the called function. */
if (socks5_connect (ctx, fd, socksport,
credentials, host? host:"", port, NULL, 0))
{
int save_errno = errno;
assuan_sock_close (fd);
gpg_err_set_errno (save_errno);
return ASSUAN_INVALID_FD;
}
return fd;
}
int
_assuan_sock_bind (assuan_context_t ctx, assuan_fd_t sockfd,
struct sockaddr *addr, int addrlen)
{
#ifdef HAVE_W32_SYSTEM
if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX)
{
struct sockaddr_in myaddr;
struct sockaddr_un *unaddr;
HANDLE filehd;
int len = sizeof myaddr;
int rc;
union {
char data[16];
int aint[4];
} nonce;
char tmpbuf[50+16];
DWORD nwritten;
if (get_nonce (nonce.data, 16))
return -1;
unaddr = (struct sockaddr_un *)addr;
myaddr.sin_port = 0;
myaddr.sin_family = AF_INET;
myaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
filehd = MyCreateFile (unaddr->sun_path,
GENERIC_WRITE,
FILE_SHARE_READ,
NULL,
CREATE_NEW,
FILE_ATTRIBUTE_NORMAL,
NULL);
if (filehd == INVALID_HANDLE_VALUE)
{
if (GetLastError () == ERROR_FILE_EXISTS)
gpg_err_set_errno (EADDRINUSE);
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;
CloseHandle (filehd);
MyDeleteFile (unaddr->sun_path);
gpg_err_set_errno (save_e);
return rc;
}
if (is_cygwin_fd (sockfd))
{
snprintf (tmpbuf, sizeof tmpbuf,
"!%d s %08x-%08x-%08x-%08x",
ntohs (myaddr.sin_port),
nonce.aint[0], nonce.aint[1], nonce.aint[2], nonce.aint[3]);
len = strlen (tmpbuf) + 1;
}
else
{
snprintf (tmpbuf, sizeof tmpbuf-16, "%d\n", ntohs (myaddr.sin_port));
len = strlen (tmpbuf);
memcpy (tmpbuf+len, nonce.data,16);
len += 16;
}
if (!WriteFile (filehd, tmpbuf, len, &nwritten, NULL))
{
CloseHandle (filehd);
MyDeleteFile (unaddr->sun_path);
gpg_err_set_errno (EIO);
return -1;
}
CloseHandle (filehd);
return 0;
}
else
{
int res = bind (HANDLE2SOCKET(sockfd), addr, addrlen);
if (res < 0)
gpg_err_set_errno ( _assuan_sock_wsa2errno (WSAGetLastError ()));
return res;
}
#else
return bind (sockfd, addr, addrlen);
#endif
}
/* Setup the ADDR structure for a Unix domain socket with the socket
name FNAME. If this is a redirected socket and R_REDIRECTED is not
NULL, it will be setup for the real socket. Returns 0 on success
and stores 1 at R_REDIRECTED if it is a redirected socket. On
error -1 is returned and ERRNO will be set. */
int
_assuan_sock_set_sockaddr_un (const char *fname, struct sockaddr *addr,
int *r_redirected)
{
struct sockaddr_un *unaddr = (struct sockaddr_un *)addr;
#if !defined(HAVE_W32_SYSTEM) && defined(HAVE_STAT)
struct stat statbuf;
#endif
if (r_redirected)
*r_redirected = 0;
#if !defined(HAVE_W32_SYSTEM) && defined(HAVE_STAT)
if (r_redirected
&& !stat (fname, &statbuf)
&& !S_ISSOCK (statbuf.st_mode)
&& S_ISREG (statbuf.st_mode))
{
/* The given socket file is not a socket but a regular file. We
use the content of that file to redirect to another socket
file. This can be used to use sockets on file systems which
do not support sockets or if for example a home directory is
shared by several machines. */
struct sockaddr_un *unaddr_new;
int redirect;
unaddr_new = eval_redirection (fname, &redirect);
if (unaddr_new)
{
memcpy (unaddr, unaddr_new, sizeof *unaddr);
free (unaddr_new);
*r_redirected = 1;
return 0;
}
if (redirect)
{
*r_redirected = 1;
return -1; /* Error. */
}
/* Fallback to standard setup. */
}
#endif /*!HAVE_W32_SYSTEM && HAVE_STAT*/
if (strlen (fname)+1 >= sizeof unaddr->sun_path)
{
gpg_err_set_errno (ENAMETOOLONG);
return -1;
}
memset (unaddr, 0, sizeof *unaddr);
unaddr->sun_family = AF_LOCAL;
strncpy (unaddr->sun_path, fname, sizeof unaddr->sun_path - 1);
unaddr->sun_path[sizeof unaddr->sun_path - 1] = 0;
return 0;
}
int
_assuan_sock_get_nonce (assuan_context_t ctx, 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;
int dummy;
if (sizeof nonce->nonce != 16)
{
gpg_err_set_errno (EINVAL);
return -1;
}
nonce->length = 16;
unaddr = (struct sockaddr_un *)addr;
if (read_port_and_nonce (unaddr->sun_path, &port, nonce->nonce, &dummy))
return -1;
}
else
{
nonce->length = 42; /* Arbitrary value 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_context_t ctx, assuan_fd_t fd,
assuan_sock_nonce_t *nonce)
{
#ifdef HAVE_W32_SYSTEM
char buffer[16];
int n;
if (sizeof nonce->nonce != 16)
{
gpg_err_set_errno (EINVAL);
return -1;
}
if (nonce->length == 42 && nonce->nonce[0] == 42)
return 0; /* Not a Unix domain socket. */
if (nonce->length != 16)
{
gpg_err_set_errno (EINVAL);
return -1;
}
if (do_readn (ctx, fd, buffer, 16))
return -1;
if (memcmp (buffer, nonce->nonce, 16))
{
gpg_err_set_errno (EACCES);
return -1;
}
if (is_cygwin_fd (fd))
{
/* Send the nonce back to the client. */
if (do_writen (ctx, fd, buffer, 16))
return -1;
/* Read the credentials. Cygwin uses the
struct ucred { pid_t pid; uid_t uid; gid_t gid; };
with pid_t being an int (4 bytes) and uid_t and gid_t being
shorts (2 bytes). Thus we need to read 8 bytes. However we
we ignore the values because they are not kernel controlled. */
if (do_readn (ctx, fd, buffer, 8))
return -1;
/* Send our credentials: We use the uid and gid we received but
our own pid. */
n = getpid ();
memcpy (buffer, &n, 4);
if (do_writen (ctx, fd, buffer, 8))
return -1;
}
#else
(void)fd;
(void)nonce;
#endif
return 0;
}
/* Public API. */
gpg_error_t
assuan_sock_init ()
{
gpg_error_t err;
#ifdef HAVE_W32_SYSTEM
WSADATA wsadat;
#endif
if (sock_ctx != NULL)
return 0;
#ifdef HAVE_W32_SYSTEM
InitializeCriticalSection (&cygwin_fdtable_cs);
#endif
err = assuan_new (&sock_ctx);
#ifdef HAVE_W32_SYSTEM
if (! err)
WSAStartup (0x202, &wsadat);
#endif
return err;
}
void
assuan_sock_deinit ()
{
if (sock_ctx == NULL)
return;
#ifdef HAVE_W32_SYSTEM
WSACleanup ();
#endif
assuan_release (sock_ctx);
sock_ctx = NULL;
#ifdef HAVE_W32_SYSTEM
DeleteCriticalSection (&cygwin_fdtable_cs);
#endif
}
int
assuan_sock_close (assuan_fd_t fd)
{
#ifdef HAVE_W32_SYSTEM
if (fd != ASSUAN_INVALID_FD)
delete_cygwin_fd (fd);
#endif
return _assuan_close (sock_ctx, fd);
}
assuan_fd_t
assuan_sock_new (int domain, int type, int proto)
{
return _assuan_sock_new (sock_ctx, domain, type, proto);
}
int
assuan_sock_set_flag (assuan_fd_t sockfd, const char *name, int value)
{
return _assuan_sock_set_flag (sock_ctx, sockfd, name, value);
}
int
assuan_sock_get_flag (assuan_fd_t sockfd, const char *name, int *r_value)
{
return _assuan_sock_get_flag (sock_ctx, sockfd, name, r_value);
}
int
assuan_sock_connect (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen)
{
return _assuan_sock_connect (sock_ctx, sockfd, addr, addrlen);
}
assuan_fd_t
assuan_sock_connect_byname (const char *host, unsigned short port,
int reserved, const char *credentials,
unsigned int flags)
{
return _assuan_sock_connect_byname (sock_ctx,
host, port, reserved, credentials, flags);
}
int
assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen)
{
return _assuan_sock_bind (sock_ctx, sockfd, addr, addrlen);
}
int
assuan_sock_set_sockaddr_un (const char *fname, struct sockaddr *addr,
int *r_redirected)
{
return _assuan_sock_set_sockaddr_un (fname, addr, r_redirected);
}
int
assuan_sock_get_nonce (struct sockaddr *addr, int addrlen,
assuan_sock_nonce_t *nonce)
{
return _assuan_sock_get_nonce (sock_ctx, addr, addrlen, nonce);
}
int
assuan_sock_check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce)
{
return _assuan_sock_check_nonce (sock_ctx, fd, nonce);
}
+
+void
+assuan_sock_set_system_hooks (assuan_system_hooks_t system_hooks)
+{
+ if (sock_ctx)
+ _assuan_system_hooks_copy (&sock_ctx->system, system_hooks);
+}
diff --git a/src/assuan.h.in b/src/assuan.h.in
index 9594e73..cfa4409 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -1,602 +1,607 @@
/* assuan.h - Definitions for the Assuan IPC library -*- c -*-
* Copyright (C) 2001-2013 Free Software Foundation, Inc.
* Copyright (C) 2001-2015 g10 Code GmbH
*
* This file is part of Assuan.
*
* 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.
*
* 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.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see .
* SPDX-License-Identifier: LGPL-2.1+
*
* @configure_input@
*/
#ifndef ASSUAN_H
#define ASSUAN_H
#include
@include:sys/types.h@
@include:unistd.h@
#include
#ifndef _ASSUAN_NO_SOCKET_WRAPPER
@include:includes@
#endif /*!_ASSUAN_NO_SOCKET_WRAPPER*/
@include:types@
#include
/* Compile time configuration:
#define _ASSUAN_NO_SOCKET_WRAPPER
Do not include the definitions for the socket wrapper feature. */
#ifdef __cplusplus
extern "C"
{
#if 0
}
#endif
#endif
/* The version of this header should match the one of the library. Do
not use this symbol in your application; use assuan_check_version
instead. */
#define ASSUAN_VERSION @version@
/* The version number of this header. It may be used to handle minor
API incompatibilities. */
#define ASSUAN_VERSION_NUMBER @version-number@
/* Check for compiler features. */
#if __GNUC__
#define _ASSUAN_GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
#if _ASSUAN_GCC_VERSION > 30100
#define _ASSUAN_DEPRECATED __attribute__ ((__deprecated__))
#endif
#endif
#ifndef _ASSUAN_DEPRECATED
#define _ASSUAN_DEPRECATED
#endif
#define ASSUAN_LINELENGTH 1002 /* 1000 + [CR,]LF */
struct assuan_context_s;
typedef struct assuan_context_s *assuan_context_t;
@include:fd-t@
assuan_fd_t assuan_fdopen (int fd);
@include:sock-nonce@
/* Global interface. */
struct assuan_malloc_hooks
{
void *(*malloc) (size_t cnt);
void *(*realloc) (void *ptr, size_t cnt);
void (*free) (void *ptr);
};
typedef struct assuan_malloc_hooks *assuan_malloc_hooks_t;
/* Categories for log messages. */
#define ASSUAN_LOG_INIT 1
#define ASSUAN_LOG_CTX 2
#define ASSUAN_LOG_ENGINE 3
#define ASSUAN_LOG_DATA 4
#define ASSUAN_LOG_SYSIO 5
#define ASSUAN_LOG_CONTROL 8
/* If MSG is NULL, return true/false depending on if this category is
logged. This is used to probe before expensive log message
generation (buffer dumps). */
typedef int (*assuan_log_cb_t) (assuan_context_t ctx, void *hook,
unsigned int cat, const char *msg);
/* Return or check the version number. */
const char *assuan_check_version (const char *req_version);
/* Set the default gpg error source. */
void assuan_set_gpg_err_source (gpg_err_source_t errsource);
/* Get the default gpg error source. */
gpg_err_source_t assuan_get_gpg_err_source (void);
/* Set the default malloc hooks. */
void assuan_set_malloc_hooks (assuan_malloc_hooks_t malloc_hooks);
/* Get the default malloc hooks. */
assuan_malloc_hooks_t assuan_get_malloc_hooks (void);
/* Set the default log callback handler. */
void assuan_set_log_cb (assuan_log_cb_t log_cb, void *log_cb_data);
/* Get the default log callback handler. */
void assuan_get_log_cb (assuan_log_cb_t *log_cb, void **log_cb_data);
/* Create a new Assuan context. The initial parameters are all needed
in the creation of the context. */
gpg_error_t assuan_new_ext (assuan_context_t *ctx, gpg_err_source_t errsource,
assuan_malloc_hooks_t malloc_hooks,
assuan_log_cb_t log_cb, void *log_cb_data);
/* Create a new context with default arguments. */
gpg_error_t assuan_new (assuan_context_t *ctx);
/* Release all resources associated with the given context. */
void assuan_release (assuan_context_t ctx);
/* Release the memory at PTR using the allocation handler of the
context CTX. This is a convenience function. */
void assuan_free (assuan_context_t ctx, void *ptr);
/* Set user-data in a context. */
void assuan_set_pointer (assuan_context_t ctx, void *pointer);
/* Get user-data in a context. */
void *assuan_get_pointer (assuan_context_t ctx);
/* Definitions of flags for assuan_set_flag(). */
typedef unsigned int assuan_flag_t;
/* When using a pipe server, by default Assuan will wait for the
forked process to die in assuan_release. In certain cases this
is not desirable. By setting this flag, the waitpid will be
skipped and the caller is responsible to cleanup a forked
process. */
#define ASSUAN_NO_WAITPID 1
/* This flag indicates whether Assuan logging is in confidential mode.
You can use assuan_{begin,end}_condidential to change the mode. */
#define ASSUAN_CONFIDENTIAL 2
/* This flag suppresses fix up of signal handlers for pipes. */
#define ASSUAN_NO_FIXSIGNALS 3
/* This flag changes assuan_transact to return comment lines via the
status callback. The default is to skip comment lines. */
#define ASSUAN_CONVEY_COMMENTS 4
/* This flag disables logging for one context. */
#define ASSUAN_NO_LOGGING 5
/* This flag forces a connection close. */
#define ASSUAN_FORCE_CLOSE 6
/* For context CTX, set the flag FLAG to VALUE. Values for flags
are usually 1 or 0 but certain flags might allow for other values;
see the description of the type assuan_flag_t for details. */
void assuan_set_flag (assuan_context_t ctx, assuan_flag_t flag, int value);
/* Return the VALUE of FLAG in context CTX. */
int assuan_get_flag (assuan_context_t ctx, assuan_flag_t flag);
/* Same as assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 1). */
void assuan_begin_confidential (assuan_context_t ctx);
/* Same as assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 0). */
void assuan_end_confidential (assuan_context_t ctx);
/* Direction values for assuan_set_io_monitor. */
#define ASSUAN_IO_FROM_PEER 0
#define ASSUAN_IO_TO_PEER 1
/* Return flags of I/O monitor. */
#define ASSUAN_IO_MONITOR_NOLOG 1
#define ASSUAN_IO_MONITOR_IGNORE 2
/* The IO monitor gets to see all I/O on the context, and can return
ASSUAN_IO_MONITOR_* bits to control actions on it. */
typedef unsigned int (*assuan_io_monitor_t) (assuan_context_t ctx, void *hook,
int inout, const char *line,
size_t linelen);
/* Set the IO monitor function. */
void assuan_set_io_monitor (assuan_context_t ctx,
assuan_io_monitor_t io_monitor, void *hook_data);
#define ASSUAN_SYSTEM_HOOKS_VERSION 2
#define ASSUAN_SPAWN_DETACHED 128
struct assuan_system_hooks
{
/* Always set to ASSUAN_SYTEM_HOOKS_VERSION. */
int version;
/* Sleep for the given number of microseconds. */
void (*usleep) (assuan_context_t ctx, unsigned int usec);
/* Create a pipe with an inheritable end. */
int (*pipe) (assuan_context_t ctx, assuan_fd_t fd[2], int inherit_idx);
/* Close the given file descriptor, created with _assuan_pipe or one
of the socket functions. */
int (*close) (assuan_context_t ctx, assuan_fd_t fd);
ssize_t (*read) (assuan_context_t ctx, assuan_fd_t fd, void *buffer,
size_t size);
ssize_t (*write) (assuan_context_t ctx, assuan_fd_t fd,
const void *buffer, size_t size);
int (*recvmsg) (assuan_context_t ctx, assuan_fd_t fd, assuan_msghdr_t msg,
int flags);
int (*sendmsg) (assuan_context_t ctx, assuan_fd_t fd,
const assuan_msghdr_t msg, int flags);
/* If NAME is NULL, don't exec, just fork. FD_CHILD_LIST is
modified to reflect the value of the FD in the peer process (on
Windows). */
int (*spawn) (assuan_context_t ctx, pid_t *r_pid, const char *name,
const char **argv,
assuan_fd_t fd_in, assuan_fd_t fd_out,
assuan_fd_t *fd_child_list,
void (*atfork) (void *opaque, int reserved),
void *atforkvalue, unsigned int flags);
/* If action is 0, like waitpid. If action is 1, just release the PID? */
pid_t (*waitpid) (assuan_context_t ctx, pid_t pid,
int action, int *status, int options);
int (*socketpair) (assuan_context_t ctx, int _namespace, int style,
int protocol, assuan_fd_t filedes[2]);
int (*socket) (assuan_context_t ctx, int _namespace, int style, int protocol);
int (*connect) (assuan_context_t ctx, int sock, struct sockaddr *addr, socklen_t length);
};
typedef struct assuan_system_hooks *assuan_system_hooks_t;
/* Configuration of the default log handler. */
/* Set the prefix to be used at the start of a line emitted by assuan
on the log stream. The default is the empty string. Note, that
this function is not thread-safe and should in general be used
right at startup. */
void assuan_set_assuan_log_prefix (const char *text);
/* Return a prefix to be used at the start of a line emitted by assuan
on the log stream. The default implementation returns the empty
string, i.e. "" */
const char *assuan_get_assuan_log_prefix (void);
/* Global default log stream. */
void assuan_set_assuan_log_stream (FILE *fp);
/* Set the per context log stream for the default log handler. */
void assuan_set_log_stream (assuan_context_t ctx, FILE *fp);
typedef gpg_error_t (*assuan_handler_t) (assuan_context_t, char *);
/*-- assuan-handler.c --*/
gpg_error_t assuan_register_command (assuan_context_t ctx,
const char *cmd_string,
assuan_handler_t handler,
const char *help_string);
gpg_error_t assuan_register_pre_cmd_notify (assuan_context_t ctx,
gpg_error_t (*fnc)(assuan_context_t, const char *cmd));
gpg_error_t assuan_register_post_cmd_notify (assuan_context_t ctx,
void (*fnc)(assuan_context_t,
gpg_error_t));
gpg_error_t assuan_register_bye_notify (assuan_context_t ctx,
assuan_handler_t handler);
gpg_error_t assuan_register_reset_notify (assuan_context_t ctx,
assuan_handler_t handler);
gpg_error_t assuan_register_cancel_notify (assuan_context_t ctx,
assuan_handler_t handler);
gpg_error_t assuan_register_input_notify (assuan_context_t ctx,
assuan_handler_t handler);
gpg_error_t assuan_register_output_notify (assuan_context_t ctx,
assuan_handler_t handler);
gpg_error_t assuan_register_option_handler (assuan_context_t ctx,
gpg_error_t (*fnc)(assuan_context_t,
const char*,
const char*));
gpg_error_t assuan_process (assuan_context_t ctx);
gpg_error_t assuan_process_next (assuan_context_t ctx, int *done);
gpg_error_t assuan_process_done (assuan_context_t ctx, gpg_error_t rc);
int assuan_get_active_fds (assuan_context_t ctx, int what,
assuan_fd_t *fdarray, int fdarraysize);
const char *assuan_get_command_name (assuan_context_t ctx);
FILE *assuan_get_data_fp (assuan_context_t ctx);
gpg_error_t assuan_set_okay_line (assuan_context_t ctx, const char *line);
gpg_error_t assuan_write_status (assuan_context_t ctx,
const char *keyword, const char *text);
/* Negotiate a file descriptor. If LINE contains "FD=N", returns N
assuming a local file descriptor. If LINE contains "FD" reads a
file descriptor via CTX and stores it in *RDF (the CTX must be
capable of passing file descriptors). Under W32 the returned FD is
a libc-type one. */
gpg_error_t assuan_command_parse_fd (assuan_context_t ctx, char *line,
assuan_fd_t *rfd);
/*-- assuan-listen.c --*/
gpg_error_t assuan_set_hello_line (assuan_context_t ctx, const char *line);
gpg_error_t assuan_accept (assuan_context_t ctx);
assuan_fd_t assuan_get_input_fd (assuan_context_t ctx);
assuan_fd_t assuan_get_output_fd (assuan_context_t ctx);
gpg_error_t assuan_close_input_fd (assuan_context_t ctx);
gpg_error_t assuan_close_output_fd (assuan_context_t ctx);
/*-- assuan-pipe-server.c --*/
gpg_error_t assuan_init_pipe_server (assuan_context_t ctx,
assuan_fd_t filedes[2]);
/*-- assuan-socket-server.c --*/
#define ASSUAN_SOCKET_SERVER_FDPASSING 1
#define ASSUAN_SOCKET_SERVER_ACCEPTED 2
gpg_error_t assuan_init_socket_server (assuan_context_t ctx,
assuan_fd_t listen_fd,
unsigned int flags);
void assuan_set_sock_nonce (assuan_context_t ctx, assuan_sock_nonce_t *nonce);
/*-- assuan-pipe-connect.c --*/
#define ASSUAN_PIPE_CONNECT_FDPASSING 1
#define ASSUAN_PIPE_CONNECT_DETACHED 128
gpg_error_t assuan_pipe_connect (assuan_context_t ctx,
const char *name,
const char *argv[],
assuan_fd_t *fd_child_list,
void (*atfork) (void *, int),
void *atforkvalue,
unsigned int flags);
/*-- assuan-socket-connect.c --*/
#define ASSUAN_SOCKET_CONNECT_FDPASSING 1
gpg_error_t assuan_socket_connect (assuan_context_t ctx, const char *name,
pid_t server_pid, unsigned int flags);
/*-- assuan-socket-connect.c --*/
gpg_error_t assuan_socket_connect_fd (assuan_context_t ctx, int fd,
unsigned int flags);
/*-- context.c --*/
pid_t assuan_get_pid (assuan_context_t ctx);
struct _assuan_peercred
{
#ifdef _WIN32
/* Empty struct not allowed on some compilers. */
unsigned int _dummy;
#else
pid_t pid;
uid_t uid;
gid_t gid;
#endif
};
typedef struct _assuan_peercred *assuan_peercred_t;
gpg_error_t assuan_get_peercred (assuan_context_t ctx,
assuan_peercred_t *peercred);
/* Client interface. */
#define ASSUAN_RESPONSE_ERROR 0
#define ASSUAN_RESPONSE_OK 1
#define ASSUAN_RESPONSE_DATA 2
#define ASSUAN_RESPONSE_INQUIRE 3
#define ASSUAN_RESPONSE_STATUS 4
#define ASSUAN_RESPONSE_END 5
#define ASSUAN_RESPONSE_COMMENT 6
typedef int assuan_response_t;
/* This already de-escapes data lines. */
gpg_error_t assuan_client_read_response (assuan_context_t ctx,
char **line, int *linelen);
gpg_error_t assuan_client_parse_response (assuan_context_t ctx,
char *line, int linelen,
assuan_response_t *response,
int *off);
/*-- assuan-client.c --*/
gpg_error_t
assuan_transact (assuan_context_t ctx,
const char *command,
gpg_error_t (*data_cb)(void *, const void *, size_t),
void *data_cb_arg,
gpg_error_t (*inquire_cb)(void*, const char *),
void *inquire_cb_arg,
gpg_error_t (*status_cb)(void*, const char *),
void *status_cb_arg);
/*-- assuan-inquire.c --*/
gpg_error_t assuan_inquire (assuan_context_t ctx, const char *keyword,
unsigned char **r_buffer, size_t *r_length,
size_t maxlen);
gpg_error_t assuan_inquire_ext (assuan_context_t ctx, const char *keyword,
size_t maxlen,
gpg_error_t (*cb) (void *cb_data,
gpg_error_t rc,
unsigned char *buf,
size_t buf_len),
void *cb_data);
/*-- assuan-buffer.c --*/
gpg_error_t assuan_read_line (assuan_context_t ctx,
char **line, size_t *linelen);
int assuan_pending_line (assuan_context_t ctx);
gpg_error_t assuan_write_line (assuan_context_t ctx, const char *line);
gpg_error_t assuan_send_data (assuan_context_t ctx,
const void *buffer, size_t length);
/* The file descriptor must be pending before assuan_receivefd is
called. This means that assuan_sendfd should be called *before* the
trigger is sent (normally via assuan_write_line ("INPUT FD")). */
gpg_error_t assuan_sendfd (assuan_context_t ctx, assuan_fd_t fd);
gpg_error_t assuan_receivefd (assuan_context_t ctx, assuan_fd_t *fd);
/*-- assuan-util.c --*/
gpg_error_t assuan_set_error (assuan_context_t ctx, gpg_error_t err,
const char *text);
/*-- assuan-socket.c --*/
/* This flag is used with assuan_sock_connect_byname to
connect via SOCKS. */
#define ASSUAN_SOCK_SOCKS 1
/* This flag is used with assuan_sock_connect_byname to force a
connection via Tor even if the socket subsystem has not been
swicthed into Tor mode. This flags overrides ASSUAN_SOCK_SOCKS. */
#define ASSUAN_SOCK_TOR 2
/* These are socket wrapper functions to support an emulation of Unix
domain sockets on Windows W32. */
gpg_error_t assuan_sock_init (void);
void assuan_sock_deinit (void);
int assuan_sock_close (assuan_fd_t fd);
assuan_fd_t assuan_sock_new (int domain, int type, int proto);
int assuan_sock_set_flag (assuan_fd_t sockfd, const char *name, int value);
int assuan_sock_get_flag (assuan_fd_t sockfd, const char *name, int *r_value);
int assuan_sock_connect (assuan_fd_t sockfd,
struct sockaddr *addr, int addrlen);
assuan_fd_t assuan_sock_connect_byname (const char *host, unsigned short port,
int reserved,
const char *credentials,
unsigned int flags);
int assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen);
int assuan_sock_set_sockaddr_un (const char *fname, struct sockaddr *addr,
int *r_redirected);
int assuan_sock_get_nonce (struct sockaddr *addr, int addrlen,
assuan_sock_nonce_t *nonce);
int assuan_sock_check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce);
+void assuan_sock_set_system_hooks (assuan_system_hooks_t system_hooks);
-/* Set the default or per context system callbacks. This is
- irreversible. */
+/* Set the default system callbacks. This is irreversible. */
void assuan_set_system_hooks (assuan_system_hooks_t system_hooks);
+/* Set the per context system callbacks. This is irreversible. */
void assuan_ctx_set_system_hooks (assuan_context_t ctx,
assuan_system_hooks_t system_hooks);
+/* Change the system hooks for the socket interface.
+ * This is not thread-safe. */
+void assuan_sock_set_system_hooks (assuan_system_hooks_t system_hooks);
+
void __assuan_usleep (assuan_context_t ctx, unsigned int usec);
int __assuan_pipe (assuan_context_t ctx, assuan_fd_t fd[2], int inherit_idx);
int __assuan_close (assuan_context_t ctx, assuan_fd_t fd);
int __assuan_spawn (assuan_context_t ctx, pid_t *r_pid, const char *name,
const char **argv, assuan_fd_t fd_in, assuan_fd_t fd_out,
assuan_fd_t *fd_child_list,
void (*atfork) (void *opaque, int reserved),
void *atforkvalue, unsigned int flags);
int __assuan_socketpair (assuan_context_t ctx, int _namespace, int style,
int protocol, assuan_fd_t filedes[2]);
int __assuan_socket (assuan_context_t ctx, int _namespace, int style, int protocol);
int __assuan_connect (assuan_context_t ctx, int sock, struct sockaddr *addr, socklen_t length);
ssize_t __assuan_read (assuan_context_t ctx, assuan_fd_t fd, void *buffer, size_t size);
ssize_t __assuan_write (assuan_context_t ctx, assuan_fd_t fd, const void *buffer, size_t size);
int __assuan_recvmsg (assuan_context_t ctx, assuan_fd_t fd, assuan_msghdr_t msg, int flags);
int __assuan_sendmsg (assuan_context_t ctx, assuan_fd_t fd, const assuan_msghdr_t msg, int flags);
pid_t __assuan_waitpid (assuan_context_t ctx, pid_t pid, int nowait, int *status, int options);
#define ASSUAN_SYSTEM_PTH_IMPL \
static void _assuan_pth_usleep (assuan_context_t ctx, unsigned int usec) \
{ (void) ctx; pth_usleep (usec); } \
static ssize_t _assuan_pth_read (assuan_context_t ctx, assuan_fd_t fd, \
void *buffer, size_t size) \
{ (void) ctx; return pth_read (fd, buffer, size); } \
static ssize_t _assuan_pth_write (assuan_context_t ctx, assuan_fd_t fd, \
const void *buffer, size_t size) \
{ (void) ctx; return pth_write (fd, buffer, size); } \
@include:sys-pth-impl@
static pid_t _assuan_pth_waitpid (assuan_context_t ctx, pid_t pid, \
int nowait, int *status, int options) \
{ (void) ctx; \
if (!nowait) return pth_waitpid (pid, status, options); \
else return 0; } \
\
struct assuan_system_hooks _assuan_system_pth = \
{ ASSUAN_SYSTEM_HOOKS_VERSION, _assuan_pth_usleep, __assuan_pipe, \
__assuan_close, _assuan_pth_read, _assuan_pth_write, \
_assuan_pth_recvmsg, _assuan_pth_sendmsg, \
__assuan_spawn, _assuan_pth_waitpid, __assuan_socketpair, \
__assuan_socket, __assuan_connect }
extern struct assuan_system_hooks _assuan_system_pth;
#define ASSUAN_SYSTEM_PTH &_assuan_system_pth
#define ASSUAN_SYSTEM_NPTH_IMPL \
static void _assuan_npth_usleep (assuan_context_t ctx, unsigned int usec) \
{ ssize_t res; (void) ctx; npth_unprotect(); \
res = __assuan_usleep (ctx, usec); \
npth_protect(); } \
static ssize_t _assuan_npth_read (assuan_context_t ctx, assuan_fd_t fd, \
void *buffer, size_t size) \
{ ssize_t res; (void) ctx; npth_unprotect(); \
res = __assuan_read (ctx, fd, buffer, size); \
npth_protect(); return res; } \
static ssize_t _assuan_npth_write (assuan_context_t ctx, assuan_fd_t fd, \
const void *buffer, size_t size) \
{ ssize_t res; (void) ctx; npth_unprotect(); \
res = __assuan_write (ctx, fd, buffer, size); \
npth_protect(); return res; } \
static int _assuan_npth_recvmsg (assuan_context_t ctx, assuan_fd_t fd, \
assuan_msghdr_t msg, int flags) \
{ int res; (void) ctx; npth_unprotect(); \
res = __assuan_recvmsg (ctx, fd, msg, flags); \
npth_protect(); return res; } \
static int _assuan_npth_sendmsg (assuan_context_t ctx, assuan_fd_t fd, \
const assuan_msghdr_t msg, int flags) \
{ int res; (void) ctx; npth_unprotect(); \
res = __assuan_sendmsg (ctx, fd, msg, flags); \
npth_protect(); return res; } \
static pid_t _assuan_npth_waitpid (assuan_context_t ctx, pid_t pid, \
int nowait, int *status, int options) \
{ pid_t res; (void) ctx; npth_unprotect(); \
res = __assuan_waitpid (ctx, pid, nowait, status, options); \
npth_protect(); return res; } \
static int _assuan_npth_connect (assuan_context_t ctx, int sock, \
struct sockaddr *addr, socklen_t len)\
{ int res; npth_unprotect(); \
res = __assuan_connect (ctx, sock, addr, len); \
npth_protect(); return res; } \
static int _assuan_npth_close (assuan_context_t ctx, assuan_fd_t fd) \
{ int res; npth_unprotect(); \
res = __assuan_close (ctx, fd); \
npth_protect(); return res; } \
\
struct assuan_system_hooks _assuan_system_npth = \
{ ASSUAN_SYSTEM_HOOKS_VERSION, _assuan_npth_usleep, __assuan_pipe, \
_assuan_npth_close, _assuan_npth_read, _assuan_npth_write, \
_assuan_npth_recvmsg, _assuan_npth_sendmsg, \
__assuan_spawn, _assuan_npth_waitpid, __assuan_socketpair, \
__assuan_socket, _assuan_npth_connect }
extern struct assuan_system_hooks _assuan_system_npth;
#define ASSUAN_SYSTEM_NPTH &_assuan_system_npth
@include:w32ce-add@
#ifdef __cplusplus
}
#endif
#endif /* ASSUAN_H */
diff --git a/src/libassuan.def b/src/libassuan.def
index 7e32a3d..ed9ceaf 100644
--- a/src/libassuan.def
+++ b/src/libassuan.def
@@ -1,120 +1,121 @@
; assuan.def - List of symbols to export.
; Copyright (C) 2005, 2009 g10 Code GmbH
;
; This file is part of ASSUAN.
;
; 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.
;
; 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.
;
; You should have received a copy of the GNU Lesser General Public
; License along with this program; if not, see .
; SPDX-License-Identifier: LGPL-2.1+
EXPORTS
assuan_accept @1
assuan_begin_confidential @2
assuan_close_input_fd @3
assuan_close_output_fd @4
assuan_command_parse_fd @5
assuan_ctx_set_system_hooks @6
assuan_end_confidential @7
assuan_get_active_fds @8
assuan_get_assuan_log_prefix @9
assuan_get_command_name @10
assuan_get_data_fp @11
assuan_get_flag @12
assuan_get_gpg_err_source @13
assuan_get_input_fd @14
assuan_get_log_cb @15
assuan_get_malloc_hooks @16
assuan_get_output_fd @17
assuan_get_peercred @18
assuan_get_pid @19
assuan_get_pointer @20
assuan_init_pipe_server @21
assuan_init_socket_server @22
assuan_inquire @23
assuan_inquire_ext @24
assuan_new @25
assuan_new_ext @26
assuan_pending_line @27
assuan_pipe_connect @28
assuan_process @29
assuan_process_done @30
assuan_process_next @31
assuan_read_line @32
assuan_receivefd @33
assuan_register_bye_notify @34
assuan_register_cancel_notify @35
assuan_register_command @36
assuan_register_input_notify @37
assuan_register_option_handler @38
assuan_register_output_notify @39
assuan_register_post_cmd_notify @40
assuan_register_reset_notify @41
assuan_release @42
assuan_send_data @43
assuan_sendfd @44
assuan_set_assuan_log_prefix @45
assuan_set_assuan_log_stream @46
assuan_set_error @47
assuan_set_flag @48
assuan_set_gpg_err_source @49
assuan_set_hello_line @50
assuan_set_io_monitor @51
assuan_set_log_cb @52
assuan_set_log_stream @53
assuan_set_malloc_hooks @54
assuan_set_okay_line @55
assuan_set_pointer @56
assuan_set_system_hooks @57
assuan_sock_bind @58
assuan_sock_check_nonce @59
assuan_sock_close @60
assuan_sock_connect @61
assuan_sock_deinit @62
assuan_sock_get_nonce @63
assuan_sock_init @64
assuan_sock_new @65
assuan_socket_connect @66
assuan_transact @67
assuan_write_line @68
assuan_write_status @69
__assuan_close @70
__assuan_pipe @71
__assuan_socketpair @72
__assuan_spawn @73
__assuan_usleep @74
assuan_fdopen @75
assuan_client_read_response @76
assuan_client_parse_response @77
assuan_set_sock_nonce @78
_assuan_w32ce_create_pipe @79
assuan_free @80
_assuan_w32ce_prepare_pipe @81
_assuan_w32ce_finish_pipe @82
__assuan_socket @83
__assuan_connect @84
assuan_register_pre_cmd_notify @85
assuan_socket_connect_fd @86
__assuan_read @87
__assuan_write @88
__assuan_recvmsg @89
__assuan_sendmsg @90
__assuan_waitpid @91
assuan_check_version @92
assuan_sock_set_sockaddr_un @93
assuan_sock_set_flag @94
assuan_sock_get_flag @95
assuan_sock_connect_byname @96
+ assuan_sock_set_system_hooks @97
; END
diff --git a/src/libassuan.vers b/src/libassuan.vers
index a178127..c9cd5d7 100644
--- a/src/libassuan.vers
+++ b/src/libassuan.vers
@@ -1,126 +1,127 @@
# libassuan.vers - List of symbols to export.
# Copyright (C) 2009 g10 Code GmbH
#
# This file is part of LIBASSUAN.
#
# LIBASSUAN 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.
#
# LIBASSUAN 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.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, see .
# SPDX-License-Identifier: LGPL-2.1+
#-----------------------------------------------------------
# Please remember to add new functions also to libassuan.def
#-----------------------------------------------------------
LIBASSUAN_1.0 {
global:
assuan_accept;
assuan_begin_confidential;
assuan_client_read_response;
assuan_client_parse_response;
assuan_close_input_fd;
assuan_close_output_fd;
assuan_command_parse_fd;
assuan_ctx_set_system_hooks;
assuan_end_confidential;
assuan_fdopen;
assuan_get_active_fds;
assuan_get_assuan_log_prefix;
assuan_get_command_name;
assuan_get_data_fp;
assuan_get_flag;
assuan_get_gpg_err_source;
assuan_get_input_fd;
assuan_get_log_cb;
assuan_get_malloc_hooks;
assuan_get_output_fd;
assuan_get_peercred;
assuan_get_pid;
assuan_get_pointer;
assuan_init_pipe_server;
assuan_init_socket_server;
assuan_inquire;
assuan_inquire_ext;
assuan_new;
assuan_new;
assuan_new_ext;
assuan_pending_line;
assuan_pipe_connect;
assuan_process;
assuan_process_done;
assuan_process_next;
assuan_read_line;
assuan_receivefd;
assuan_register_bye_notify;
assuan_register_cancel_notify;
assuan_register_command;
assuan_register_input_notify;
assuan_register_option_handler;
assuan_register_output_notify;
assuan_register_pre_cmd_notify;
assuan_register_post_cmd_notify;
assuan_register_reset_notify;
assuan_release;
assuan_release;
assuan_send_data;
assuan_sendfd;
assuan_set_assuan_log_prefix;
assuan_set_assuan_log_stream;
assuan_set_error;
assuan_set_flag;
assuan_set_gpg_err_source;
assuan_set_hello_line;
assuan_set_io_monitor;
assuan_set_log_cb;
assuan_set_log_stream;
assuan_set_malloc_hooks;
assuan_set_okay_line;
assuan_set_pointer;
assuan_set_sock_nonce;
assuan_set_system_hooks;
assuan_sock_bind;
assuan_sock_check_nonce;
assuan_sock_close;
assuan_sock_connect;
assuan_sock_deinit;
assuan_sock_get_nonce;
assuan_sock_init;
assuan_sock_new;
assuan_socket_connect;
assuan_transact;
assuan_write_line;
assuan_write_status;
assuan_free;
assuan_socket_connect_fd;
assuan_check_version;
assuan_sock_set_sockaddr_un;
assuan_sock_set_flag;
assuan_sock_get_flag;
assuan_sock_connect_byname;
+ assuan_sock_set_system_hooks;
__assuan_close;
__assuan_pipe;
__assuan_socketpair;
__assuan_spawn;
__assuan_usleep;
__assuan_socket;
__assuan_connect;
__assuan_read;
__assuan_write;
__assuan_recvmsg;
__assuan_sendmsg;
__assuan_waitpid;
local:
*;
};