mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
dirmngr: Change to new ADNS Tor mode init scheme.
* dirmngr/dns-stuff.c (tor_credentials): New. (enable_dns_tormode): Add arg new_circuit and update tor_credentials. (my_adns_init): Rework to set Tor mode using a config file options and always use credentials. * dirmngr/server.c (cmd_dns_cert): Improve error message. * dirmngr/t-dns-stuff.c (main): Add option --new-circuit. -- Note that the option --new-circuit in t-dns-stuff is not really useful because a new circuit is also used for the first call to the function. Todo: We need to find a policy when to requrest a new curcuit and we also need to add credentials to the assuan_sock_connect calls. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
f92e95175e
commit
288c9919dc
4 changed files with 57 additions and 11 deletions
|
@ -41,6 +41,7 @@ main (int argc, char **argv)
|
|||
gpg_error_t err;
|
||||
int any_options = 0;
|
||||
int opt_tor = 0;
|
||||
int opt_new_circuit = 0;
|
||||
int opt_cert = 0;
|
||||
int opt_srv = 0;
|
||||
int opt_bracket = 0;
|
||||
|
@ -66,6 +67,7 @@ main (int argc, char **argv)
|
|||
" --verbose print timings etc.\n"
|
||||
" --debug flyswatter\n"
|
||||
" --use-tor use Tor\n"
|
||||
" --new-circuit use a new Tor circuit\n"
|
||||
" --bracket enclose v6 addresses in brackets\n"
|
||||
" --cert lookup a CERT RR\n"
|
||||
" --srv lookup a SRV RR\n"
|
||||
|
@ -89,6 +91,11 @@ main (int argc, char **argv)
|
|||
opt_tor = 1;
|
||||
argc--; argv++;
|
||||
}
|
||||
else if (!strcmp (*argv, "--new-circuit"))
|
||||
{
|
||||
opt_new_circuit = 1;
|
||||
argc--; argv++;
|
||||
}
|
||||
else if (!strcmp (*argv, "--bracket"))
|
||||
{
|
||||
opt_bracket = 1;
|
||||
|
@ -131,7 +138,7 @@ main (int argc, char **argv)
|
|||
|
||||
if (opt_tor)
|
||||
{
|
||||
err = enable_dns_tormode ();
|
||||
err = enable_dns_tormode (opt_new_circuit);
|
||||
if (err)
|
||||
{
|
||||
fprintf (stderr, "error switching into Tor mode: %s\n",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue