diff --git a/config/versions.json b/config/versions.json index b2833ff82b..c8e1371170 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "github.com/golang-fips/go": "main", "github.com/golang-fips/openssl": "61a53ab338d5f1657c6fe5d856d24528bfdd731d", - "github.com/golang/go": "go1.23.6" + "github.com/golang/go": "go1.23.7" } diff --git a/patches/001-initial-openssl-for-fips.patch b/patches/001-initial-openssl-for-fips.patch index 869de0e507..fa3c310d79 100644 --- a/patches/001-initial-openssl-for-fips.patch +++ b/patches/001-initial-openssl-for-fips.patch @@ -9678,6 +9678,41 @@ index 0000000000..5de62f95a7 + } + return nil +} +diff --git a/src/vendor/golang.org/x/net/http/httpproxy/proxy.go b/src/vendor/golang.org/x/net/http/httpproxy/proxy.go +index d89c257ae7..6404aaf157 100644 +--- a/src/vendor/golang.org/x/net/http/httpproxy/proxy.go ++++ b/src/vendor/golang.org/x/net/http/httpproxy/proxy.go +@@ -14,7 +14,6 @@ import ( + "errors" + "fmt" + "net" +- "net/netip" + "net/url" + "os" + "strings" +@@ -178,10 +177,8 @@ func (cfg *config) useProxy(addr string) bool { + if host == "localhost" { + return false + } +- nip, err := netip.ParseAddr(host) +- var ip net.IP +- if err == nil { +- ip = net.IP(nip.AsSlice()) ++ ip := net.ParseIP(host) ++ if ip != nil { + if ip.IsLoopback() { + return false + } +@@ -363,9 +360,6 @@ type domainMatch struct { + } + + func (m domainMatch) match(host, port string, ip net.IP) bool { +- if ip != nil { +- return false +- } + if strings.HasSuffix(host, m.host) || (m.matchHost && host == m.host[1:]) { + return m.port == "" || m.port == port + } diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt index b8a0b84a28..7b4bce2e2d 100644 --- a/src/vendor/modules.txt