Upstream version 2.4.2

# gpg: Signature made Fri 04 Dec 2015 01:47:30 PM EST using RSA key ID 00221E93
# gpg: Good signature from "Eric Dorland <eric@kuroneko.ca>"
# gpg:                 aka "Eric Dorland <eric@debian.org>"

* configure.ac: Bump LT version to C7/A7/R2.

Signed-off-by: Werner Koch <wk@gnupg.org>

Upstream version 2.4.1

--
Signed-off-by: Justus Winter <justus@g10code.com>

* src/assuan-socket.c (socks5_connect): Add special treatment for
empty hostnames.
(_assuan_sock_connect_byname): Add feature to test for proxy
availibility.
* tests/socks5.c (main): Add option --have-proxy.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/assuan.h.in (ASSUAN_SYSTEM_NPTH_IMPL): Add wrapper for connect.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/assuan-socket.c (do_readn): Use ssize_t for N.

--

* configure.ac: Bump LT version to C7/A7/R1.

* tests/socks5.c (main): Call gpgrt_init.  Check for write and read
errors.  Allow building of some parts even w/o getaddrinfo.

* src/assuan-socket.c (TOR_PORT2): New.
(_assuan_sock_wsa2errno): Map WSAECONNREFUSED.
(socks5_connect): Fall back to TOR_PORT2.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/assuan-socket.c: Add errno values not defined by mingw-w64 2.0

Upstream version 2.4.0

--

* configure.ac: Bump LT version to C7/A7/Ro.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/assuan-socket.c (socks5_connect): Use assuan_fd_t instead of
int.
(_assuan_sock_connect): Ditto.
(_assuan_sock_connect_byname): Ditto.

Signed-off-by: Werner Koch <wk@gnupg.org>

* configure.ac: Require libgpg-error 1.17.
(vasprintf): Remove ac_replace.
* src/assuan-defs.h [!HAVE_VASPRINTF]: Remove replace wrapper.
* src/assuan-logging.c (_assuan_log_control_channel):
(_assuan_log_control_channel): s/asprintf/gpgrt_asprintf/.
* src/debug.c (_assuan_debug): s/vasprintf/gpgrt_vasprintf/.
(_assuan_debug_begin): Ditto.
(_assuan_debug_add): Ditto. s/asprintf/gpgrt_asprintf/.
--

We plan to move more code into libgpg-error/gpgrt anyway thus this is
a good start which also fixes this bug:

GnuPG-bug-id: 1477
Signed-off-by: Werner Koch <wk@gnupg.org>

* tests/socks5.c (main): Use GET instead of HEAD

* src/assuan.h.in (ASSUAN_SOCK_SOCKS): New.
(ASSUAN_SOCK_TOR): New.
(assuan_sock_connect_byname): New.
* src/libassuan.def, src/libassuan.vers: Add that function.

* src/assuan-socket.c (socks5_connect): Add args socksport,
credentials, hostname, and hostport.  Implement user/password
authentication and domainname address type.  Change callers
accordingly.
(_assuan_sock_connect_byname): New.
(assuan_sock_connect_byname): New.

* tests/socks5.c (main): Add options --byname, --user, and --pass.
--

The assuan_sock_connect_byname may eventually be extended to work
without Tor or SOCKS by using getaddrinfo.  Or we move that all to
libgpgrt (aka libgpg-error).

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/assuan-socket.c: Include netinet/in.h and arpa/inet.h.
(SOCKS_PORT, TOR_PORT): New constants.
(tor_mode): New variable.
(_assuan_sock_set_flag): Add flags "tor-mode" and "socks".
(_assuan_sock_get_flag): Ditto.
(do_readn, do_writen): Always build.
(socks5_connect): New.
(use_socks): New.
(_assuan_sock_connect): Divert to socks5_connect if requested.

* tests/socks5.c: New.
* configure.ac (AH_TOP): Define GPGRT_ENABLE_ES_MACROS.
(AC_CHECK_FUNC): Check for getaddrinfo.
* tests/Makefile.am (testtools): New. Add socks5.
(AM_LDFLAGS): Add -no-install for easier debugging.
--

A future extension might be a new assuan_sock_direct_connect call
takes the hostname as a string and returns a new socket.  This allows
the proxy to do the resolving.  However, in the long term these socket
wrapper should be moved to libgpgrt (aka libgpg-error).

Signed-off-by: Werner Koch <wk@gnupg.org>

Upstream version 2.3.0

* configure.ac: Set LT version to C6/A6/R0.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/assuan-socket.c (cygwin_fdtable, cygwin_fdtable_cs): New.
(is_cygwin_fd, insert_cygwin_fd, delete_cygwin_fd): New.
(assuan_sock_init) [W32]: Init the CS.
(assuan_sock_deinit) [W32]: Deinit the CS.
(read_port_and_nonce): Add arg cygwin and detect Cygwin socket files.
(_assuan_sock_set_flag): Add "cygwin" flag.
(_assuan_sock_get_flag): Ditto.
(do_readn, do_writen): New.
(_assuan_sock_bind): Create a Cygwin socket file depending on a socket
flag.
(_assuan_sock_connect): Handle the cygwin socket protocol.
(_assuan_sock_check_nonce): Ditto.
--

This code has not been tested.

Signed-off-by: Werner Koch <wk@gnupg.org>

* src/assuan-inquire.c (assuan_inquire): Clear return args on error.
Read up remaining lines after MAXLEN has been hit.
--

If we would stop immediately at MAXLEN, as we did, the client would
continue to send data which the server may consider as new Assuan
commands.

Signed-off-by: Werner Koch <wk@gnupg.org>