Skip to content

Commit

Permalink
Rename tls_client_auth to doh_client_x509_auth
Browse files Browse the repository at this point in the history
Maybe improves clarity? I can never remember what tls_client_auth does.
  • Loading branch information
jedisct1 committed Apr 26, 2020
1 parent 3775d59 commit 3e264b9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions dnscrypt-proxy/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -228,7 +228,7 @@ type TLSClientAuthCredsConfig struct {
ClientKey string `toml:"client_key"`
}

type TLSClientAuthConfig struct {
type DoHClientX509AuthConfig struct {
Creds []TLSClientAuthCredsConfig `toml:"creds"`
}

Expand Down Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion dnscrypt-proxy/example-dnscrypt-proxy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
Expand Down

0 comments on commit 3e264b9

Please sign in to comment.