diff options
| author | Werner Koch <[email protected]> | 2016-07-14 08:40:15 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-07-14 08:48:34 +0000 |
| commit | c98995efefbdebea8f53d54ba2df4217dfd31ad4 (patch) | |
| tree | fcdc68614342f8d944e56583b2be614b3f56b476 /dirmngr/server.c | |
| parent | build: Update config.{guess,sub} to {2016-05-15,2016-06-20}. (diff) | |
| download | gnupg-c98995efefbdebea8f53d54ba2df4217dfd31ad4.tar.gz gnupg-c98995efefbdebea8f53d54ba2df4217dfd31ad4.zip | |
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 <[email protected]>
Diffstat (limited to 'dirmngr/server.c')
| -rw-r--r-- | dirmngr/server.c | 9 |
1 files changed, 2 insertions, 7 deletions
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 } |