1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

build: Require at least Libassuan 2.4.1.

* configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.4.1.
* agent/gpg-agent.c (create_server_socket): Remove check for
libassuan >= 2.3.0 and >= 2.1.4.
(main): Remove check for libassuan >= 2.1.4.
* scd/scdaemon.c (create_server_socket): Remove check for
libassuan >= 2.1.4.
* dirmngr/dirmngr.c (set_tor_mode): Remove check for
libassuan >= 2.3.0.
* dirmngr/http.c (http_raw_connect, send_request): Remove checks for
libassuan >= 2.3.0.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-12-02 18:47:50 +01:00
parent 28195f8d27
commit 69db3285e4
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
5 changed files with 2 additions and 65 deletions

View file

@ -753,9 +753,7 @@ http_raw_connect (http_t *r_hd, const char *server, unsigned short port,
{
int mode;
#if ASSUAN_VERSION_NUMBER >= 0x020300 /* >= 2.3.0 */
if (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode)
#endif
{
log_error ("Tor support is not available\n");
return gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);
@ -1481,9 +1479,7 @@ send_request (http_t hd, const char *httphost, const char *auth,
{
int mode;
#if ASSUAN_VERSION_NUMBER >= 0x020300 /* >= 2.3.0 */
if (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode)
#endif
{
log_error ("Tor support is not available\n");
return gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);