Compatibility with raw IPv6 addresses as hostname

[tofuproxy.git] / tls / dane.go

diff --git a/tls/dane.go b/tls/dane.go
index ba6e7d059422718af4c74e934df409940c9afc43..b970cc226fc9276563b15b2e613a2e651710a83a 100644 (file)
--- a/tls/dane.go
+++ b/tls/dane.go
@@ -25,7 +25,6 @@ import (
        "encoding/hex"
        "fmt"
        "log"
-       "strings"
 
        "github.com/miekg/dns"
 )
@@ -36,12 +35,13 @@ func DANE(addr string, cert *x509.Certificate) (bool, bool) {
        if DNSSrv == "" {
                return false, false
        }
-       host := addr
-       port := "443"
-       cols := strings.Split(addr, ":")
-       if len(cols) > 1 {
-               host = cols[0]
-               port = cols[1]
+       host, port, err := SplitHostPort(addr)
+       if err != nil {
+               log.Printf("can not split host+port: %s: %+v\n", addr, err)
+               return false, false
+       }
+       if port == "" {
+               port = "443"
        }
        m := new(dns.Msg)
        m.SetQuestion(dns.Fqdn(fmt.Sprintf("_%s._tcp.%s", port, host)), dns.TypeTLSA)