security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

dirmngr: Allow testing for a running Tor via "getinfo tor". 

* dirmngr/server.c (cmd_getinfo): Print an S line if Tor is not
running.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-11-27 12:21:45 +01:00
parent 82f6abb480
commit da5a232199
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dirmngr/server.c
View File

@ -2123,8 +2123,25 @@ cmd_getinfo (assuan_context_t ctx, char *line)
{
if (opt.use_tor)
{
err = 0;
assuan_set_okay_line (ctx, " - Tor mode is enabled");
#if ASSUAN_VERSION_NUMBER >= 0x020402
/* Check whether we can connect to the proxy. We use a
special feature introduced with libassuan 2.4.2. */
int sock = assuan_sock_connect_byname (NULL, 0, 0, NULL,
ASSUAN_SOCK_TOR);
if (sock == ASSUAN_INVALID_FD)
{
err = assuan_write_status
(ctx, "NO_TOR",
errno == ECONNREFUSED? "Tor not running" : strerror (errno));
}
else
{
assuan_sock_close (sock);
err = 0;
}
if (!err)
#endif /* Libassuan >= 2.4.2 */
assuan_set_okay_line (ctx, "- Tor mode is enabled");
}
else
err = set_error (GPG_ERR_FALSE, "Tor mode is NOT enabled");