miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Print "additional certificate" when a server has multiple valid certs 

This doesn't mean anything but looks less confusing than having the
same message twice

Fixes #303
This commit is contained in:
Frank Denis 2018-04-02 20:55:42 +02:00
parent d4367393c4
commit f0a690701d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dnscrypt-proxy/dnscrypt_certs.go
View File

@ -43,6 +43,7 @@ func FetchCurrentDNSCryptCert(proxy *Proxy, serverName *string, proto string, pk
now := uint32(time.Now().Unix()) now := uint32(time.Now().Unix())
certInfo := CertInfo{CryptoConstruction: UndefinedConstruction} certInfo := CertInfo{CryptoConstruction: UndefinedConstruction}
highestSerial := uint32(0) highestSerial := uint32(0)
var certCountStr string
for _, answerRr := range in.Answer { for _, answerRr := range in.Answer {
binCert, err := packTxtString(strings.Join(answerRr.(*dns.TXT).Txt, "")) binCert, err := packTxtString(strings.Join(answerRr.(*dns.TXT).Txt, ""))
if err != nil { if err != nil {
@ -135,10 +136,11 @@ func FetchCurrentDNSCryptCert(proxy *Proxy, serverName *string, proto string, pk
copy(certInfo.ServerPk[:], serverPk[:]) copy(certInfo.ServerPk[:], serverPk[:])
copy(certInfo.MagicQuery[:], binCert[104:112]) copy(certInfo.MagicQuery[:], binCert[104:112])
if isNew { if isNew {
dlog.Noticef("[%s] OK (crypto v%d) - rtt: %dms", *serverName, cryptoConstruction, rtt.Nanoseconds()/1000000) dlog.Noticef("[%s] OK (crypto v%d) - rtt: %dms%s", *serverName, cryptoConstruction, rtt.Nanoseconds()/1000000, certCountStr)
} else { } else {
dlog.Infof("[%s] OK (crypto v%d) - rtt: %dms", *serverName, cryptoConstruction, rtt.Nanoseconds()/1000000) dlog.Infof("[%s] OK (crypto v%d) - rtt: %dms%s", *serverName, cryptoConstruction, rtt.Nanoseconds()/1000000, certCountStr)
} }
certCountStr = " - additional certificate"
} }
if certInfo.CryptoConstruction == UndefinedConstruction { if certInfo.CryptoConstruction == UndefinedConstruction {
return certInfo, 0, errors.New("No useable certificate found") return certInfo, 0, errors.New("No useable certificate found")