From 29f1b083a050a70ce0be5de95a7602740cd55959 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 26 Jan 2018 01:51:05 +0100 Subject: [PATCH] Rename a few things to prepare for DoH support --- dnscrypt-proxy/{certs.go => dnscrypt_certs.go} | 2 +- dnscrypt-proxy/serversInfo.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dnscrypt-proxy/{certs.go => dnscrypt_certs.go} (96%) diff --git a/dnscrypt-proxy/certs.go b/dnscrypt-proxy/dnscrypt_certs.go similarity index 96% rename from dnscrypt-proxy/certs.go rename to dnscrypt-proxy/dnscrypt_certs.go index ade7a150..47b15bc2 100644 --- a/dnscrypt-proxy/certs.go +++ b/dnscrypt-proxy/dnscrypt_certs.go @@ -22,7 +22,7 @@ type CertInfo struct { ForwardSecurity bool } -func FetchCurrentCert(proxy *Proxy, serverName *string, proto string, pk ed25519.PublicKey, serverAddress string, providerName string) (CertInfo, int, error) { +func FetchCurrentDNSCryptCert(proxy *Proxy, serverName *string, proto string, pk ed25519.PublicKey, serverAddress string, providerName string) (CertInfo, int, error) { if len(pk) != ed25519.PublicKeySize { return CertInfo{}, 0, errors.New("Invalid public key length") } diff --git a/dnscrypt-proxy/serversInfo.go b/dnscrypt-proxy/serversInfo.go index 030623e1..6775fef0 100644 --- a/dnscrypt-proxy/serversInfo.go +++ b/dnscrypt-proxy/serversInfo.go @@ -150,7 +150,7 @@ func (serversInfo *ServersInfo) fetchServerInfo(proxy *Proxy, name string, stamp dlog.Warnf("Public key [%s] shouldn't be hex-encoded any more", string(stamp.serverPk)) stamp.serverPk = serverPk } - certInfo, rtt, err := FetchCurrentCert(proxy, &name, proxy.mainProto, stamp.serverPk, stamp.serverAddrStr, stamp.providerName) + certInfo, rtt, err := FetchCurrentDNSCryptCert(proxy, &name, proxy.mainProto, stamp.serverPk, stamp.serverAddrStr, stamp.providerName) if err != nil { return ServerInfo{}, err }