From 3e264b9da9ae2cf7895a53f93b69b71787ad9059 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 26 Apr 2020 21:21:00 +0200 Subject: [PATCH] Rename tls_client_auth to doh_client_x509_auth Maybe improves clarity? I can never remember what tls_client_auth does. --- dnscrypt-proxy/config.go | 6 +++--- dnscrypt-proxy/example-dnscrypt-proxy.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnscrypt-proxy/config.go b/dnscrypt-proxy/config.go index 384ac000..bde3257f 100644 --- a/dnscrypt-proxy/config.go +++ b/dnscrypt-proxy/config.go @@ -93,7 +93,7 @@ type Config struct { BlockedQueryResponse string `toml:"blocked_query_response"` QueryMeta []string `toml:"query_meta"` AnonymizedDNS AnonymizedDNSConfig `toml:"anonymized_dns"` - TLSClientAuth TLSClientAuthConfig `toml:"tls_client_auth"` + DoHClientX509Auth DoHClientX509AuthConfig `toml:"doh_client_x509_auth"` } func newConfig() Config { @@ -228,7 +228,7 @@ type TLSClientAuthCredsConfig struct { ClientKey string `toml:"client_key"` } -type TLSClientAuthConfig struct { +type DoHClientX509AuthConfig struct { Creds []TLSClientAuthCredsConfig `toml:"creds"` } @@ -500,7 +500,7 @@ func ConfigLoad(proxy *Proxy, flags *ConfigFlags) error { } proxy.skipAnonIncompatbibleResolvers = config.AnonymizedDNS.SkipIncompatible - configClientCreds := config.TLSClientAuth.Creds + configClientCreds := config.DoHClientX509Auth.Creds creds := make(map[string]DOHClientCreds) for _, configClientCred := range configClientCreds { credFiles := DOHClientCreds{ diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml index 23a79658..69b6372f 100644 --- a/dnscrypt-proxy/example-dnscrypt-proxy.toml +++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml @@ -645,7 +645,7 @@ fragments_blocked = ['cisco', 'cisco-ipv6', 'cisco-familyshield', 'cisco-familys # This is only useful if you are operating your own, private DoH server(s). # (for DNSCrypt, see the `query_meta` feature instead) -# [tls_client_auth] +# [doh_client_x509_auth] # creds = [ # { server_name='myserver', client_cert='client.crt', client_key='client.key' }