From c98995efefbdebea8f53d54ba2df4217dfd31ad4 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 14 Jul 2016 10:40:15 +0200 Subject: build: Require latest released libraries * agent/protect.c (OCB_MODE_SUPPORTED): Remove macro. (do_encryption): Always support OCB. (do_decryption): Ditto. (agent_unprotect): Ditto. * dirmngr/server.c (is_tor_running): Unconditionally build this. -- Although not technically required, it is easier to require them to avoid bug reports due to too old library versions. Signed-off-by: Werner Koch --- dirmngr/server.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'dirmngr/server.c') diff --git a/dirmngr/server.c b/dirmngr/server.c index d3e57c037..db6f5a8ff 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -274,14 +274,12 @@ strcpy_escaped_plus (char *d, const unsigned char *s) } -/* This fucntion returns true if a Tor server is running. The sattus +/* This function returns true if a Tor server is running. The sattus is cached for the current conenction. */ static int is_tor_running (ctrl_t ctrl) { -#if ASSUAN_VERSION_NUMBER >= 0x020402 - /* Check whether we can connect to the proxy. We use a - special feature introduced with libassuan 2.4.2. */ + /* Check whether we can connect to the proxy. */ if (!ctrl || !ctrl->server_local) return 0; /* Ooops. */ @@ -300,9 +298,6 @@ is_tor_running (ctrl_t ctrl) } } return (ctrl->server_local->tor_state > 0); -#else /* Libassuan < 2.4.2 */ - return 0; /* We don't know. */ -#endif } -- cgit v1.2.3