diff options
author | Werner Koch <[email protected]> | 2015-10-20 17:03:26 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2015-10-20 17:03:26 +0000 |
commit | 58ebe50bdf4837e9ab2d3f8c6e5fcf28c66f26e9 (patch) | |
tree | 0d51f1bbc2762349f7094b7128e5eb74822077c4 /dirmngr/dns-cert.c | |
parent | w32: Allow building again. (diff) | |
download | gnupg-58ebe50bdf4837e9ab2d3f8c6e5fcf28c66f26e9.tar.gz gnupg-58ebe50bdf4837e9ab2d3f8c6e5fcf28c66f26e9.zip |
dirmngr: Prefer ADNS over system resolver.
* configure.ac (HAVE_ADNS_IF_TORMODE): New ac_define.
(USE_DNS_CERT): Prefer ADNS over the system resolver.
* dirmngr/dns-cert.c (tor_mode): New global var.
(enable_dns_tormode): New func.
(get_dns_cert): Use DNS resolver at 8.8.8.8 in tor-mode.
* dirmngr/server.c (cmd_dns_cert): If supported allow DNS requests.
Diffstat (limited to '')
-rw-r--r-- | dirmngr/dns-cert.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/dirmngr/dns-cert.c b/dirmngr/dns-cert.c index 3845a4b25..712dfc017 100644 --- a/dirmngr/dns-cert.c +++ b/dirmngr/dns-cert.c @@ -59,7 +59,22 @@ /* ADNS has no support for CERT yet. */ #define my_adns_r_cert 37 +/* If set Tor mode shall be used. */ +static int tor_mode; +/* Sets the module in TOR mode. Returns 0 is this is possible or an + error code. */ +gpg_error_t +enable_dns_tormode (void) +{ +#if defined(USE_DNS_CERT) && defined(USE_ADNS) +# if HAVE_ADNS_IF_TORMODE + tor_mode = 1; + return 0; +# endif +#endif + return gpg_error (GPG_ERR_NOT_IMPLEMENTED); +} /* Returns 0 on success or an error code. If a PGP CERT record was found, the malloced data is returned at (R_KEY, R_KEYLEN) and @@ -92,7 +107,9 @@ get_dns_cert (const char *name, int want_certtype, *r_fprlen = 0; *r_url = NULL; - if (adns_init (&state, adns_if_noerrprint, NULL)) + if (tor_mode? adns_init_strcfg (&state, adns_if_noerrprint|adns_if_tormode, + NULL, "nameserver 8.8.8.8") + /* */: adns_init (&state, adns_if_noerrprint, NULL)) { err = gpg_err_make (default_errsource, gpg_err_code_from_syserror ()); log_error ("error initializing adns: %s\n", strerror (errno)); |