bytes.Equal instead of bytes.Compare

[tofuproxy.git] / tls / dane.go

diff --git a/tls/dane.go b/tls/dane.go
index ba6e7d059422718af4c74e934df409940c9afc43..f2db78331b3d2f448002f8af2632fe0d834f7e62 100644 (file)
--- a/tls/dane.go
+++ b/tls/dane.go
@@ -1,7 +1,7 @@
 /*
 tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
              manager, WARC/geminispace browser
-Copyright (C) 2021-2022 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2021-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -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)