From b3bfd73ce9212044011cb8f316a633bae95bb9cc Mon Sep 17 00:00:00 2001 From: "bot-for-go[bot]" <199222863+bot-for-go[bot]@users.noreply.github.com> Date: Wed, 28 Oct 2026 16:11:34 +0000 Subject: [PATCH 1/3] Update submodule to latest master (3b8e23dc): cmd/internal/script: report the duration of a failed command to help with triage --- go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go b/go index dac9fe5ea9..3b8e23dc38 160000 --- a/go +++ b/go @@ -1 +1 @@ -Subproject commit dac9fe5ea9bed1733cb27fbd91aa43457de980b4 +Subproject commit 3b8e23dc38e276e325ab34e1b3f1703f7130003e From 993091375d8bd69300a6a20ffe4d37f1e65de8f2 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 28 Oct 2026 16:32:53 +0000 Subject: [PATCH 2/3] resolve 3-way merge conflicts --- .../0001-Vendor-external-dependencies.patch | 40 +++++++------- patches/0002-Add-crypto-backends.patch | 53 +++++++++---------- patches/index.json | 52 +++++++++--------- 3 files changed, 72 insertions(+), 73 deletions(-) diff --git a/patches/0001-Vendor-external-dependencies.patch b/patches/0001-Vendor-external-dependencies.patch index a4e8b0c86c..8e402a4fcc 100644 --- a/patches/0001-Vendor-external-dependencies.patch +++ b/patches/0001-Vendor-external-dependencies.patch @@ -905,7 +905,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result create mode 100644 src/vendor/github.com/microsoft/go/cryptobackend/tls13/tls13_windows.go diff --git a/src/cmd/go.mod b/src/cmd/go.mod -index b69ed87ac99bf9593c39acc552531be06a65732d..ae62d9236d9ce1eba905dac66ecaf72ae200f54e 100644 +index 76efe2fda45481e8c510594708987859c0e1e498..e3fc261a6b72639404f33143e1eb52687da43239 100644 --- a/src/cmd/go.mod +++ b/src/cmd/go.mod @@ -4,6 +4,8 @@ go 1.28 @@ -918,7 +918,7 @@ index b69ed87ac99bf9593c39acc552531be06a65732d..ae62d9236d9ce1eba905dac66ecaf72a golang.org/x/build v0.0.0-20260715183034-a43f90886f2e golang.org/x/mod v0.41.0 diff --git a/src/cmd/go.sum b/src/cmd/go.sum -index 550a982c5176cd004dcf3e2bce8268207eee7882..87cd25594e6fb263d408e6b22b0a2dc00cb8f6c0 100644 +index 5a824a7a3bc6a80346e09e435f2f6e9e11202db8..1f076d7080ac5fc87b78429715e7bf6ff11fc033 100644 --- a/src/cmd/go.sum +++ b/src/cmd/go.sum @@ -4,6 +4,10 @@ github.com/google/pprof v0.0.0-20260507013755-92041b743c96 h1:YDDnaZ9afWajDboPMt @@ -2750,7 +2750,7 @@ index 0000000000000000000000000000000000000000..016de9bdd95956b5918ef36ea8cbd07f + return filtered +} diff --git a/src/cmd/vendor/modules.txt b/src/cmd/vendor/modules.txt -index 0be16ea83c91cc064475a718c62cc8cba5e3df5f..75196e88ef084b35027247a9c20f8c01c4fc3dfc 100644 +index 3b94cfb7fcbb55d87beea9a57032bcea333064f8..7d3d6d6ef9b3b49dda2c1a0305a21c4a1f6431f7 100644 --- a/src/cmd/vendor/modules.txt +++ b/src/cmd/vendor/modules.txt @@ -16,6 +16,17 @@ github.com/google/pprof/third_party/svgpan @@ -2818,7 +2818,7 @@ index 0000000000000000000000000000000000000000..ab958419731f59c42d1ae2210dd94b06 +// This file is here just to declare cryptobackend dependencies. +// This allows tracking their versions in a single patch file. diff --git a/src/go.mod b/src/go.mod -index 12b6b39c9e4cf8c4315083c57d41d759c2878eee..747dbcbab927cafae692607929c6662d0acf537b 100644 +index fd6f45f3edfb70d79fe2563180cbd9df9d41774d..0a3838a367e100fa2ffa1645d0c99f1558d8198f 100644 --- a/src/go.mod +++ b/src/go.mod @@ -3,12 +3,18 @@ module std @@ -2826,22 +2826,22 @@ index 12b6b39c9e4cf8c4315083c57d41d759c2878eee..747dbcbab927cafae692607929c6662d require ( + github.com/microsoft/go/cryptobackend v0.0.0 - golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2 - golang.org/x/net v0.59.0 - golang.org/x/tools v0.50.1-0.20260929192349-98444708d405 + golang.org/x/crypto v0.58.0 + golang.org/x/net v0.61.1-0.20261022225259-05c76ee9adc5 + golang.org/x/tools v0.51.0 ) require ( + github.com/microsoft/go-crypto-darwin v0.0.3-0.20261026090017-171c4346c8c7 // indirect + github.com/microsoft/go-crypto-openssl v0.5.1-0.20261026090129-f83222ce3a39 // indirect + github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832 // indirect - golang.org/x/sys v0.48.0 // indirect - golang.org/x/text v0.42.0 // indirect + golang.org/x/sys v0.49.0 // indirect + golang.org/x/text v0.43.0 // indirect ) + +replace github.com/microsoft/go/cryptobackend => ../../cryptobackend diff --git a/src/go.sum b/src/go.sum -index 4d2c4120ca2482bc9543576c7e585fa933c17a96..457211e6e8efeb349f5250a1d88583c2140d67ac 100644 +index 895e0c0db54fbfa63ecbe491ecdf83e3554c78cf..3e21b9cad3d4713db7c73ceeaf4a121a2f08dae3 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,3 +1,9 @@ @@ -2851,14 +2851,14 @@ index 4d2c4120ca2482bc9543576c7e585fa933c17a96..457211e6e8efeb349f5250a1d88583c2 +github.com/microsoft/go-crypto-openssl v0.5.1-0.20261026090129-f83222ce3a39/go.mod h1:rdSY8BhWs3fySEKPnwYbTbCAWxnXQAfrE8qBibXNU/M= +github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832 h1:j9iNaPbnm5YcNqOxBbOFzvRhzKdnYRTVsTGUjAcZhxk= +github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832/go.mod h1:ic6qQ5ko8bzigvuQbGMknZ4WzS4/KDQ9cypGMdqn38s= - golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2 h1:S2kz2UVkb4BhxS9tvxdkfNT6T8NqtaUQE+qv1ObhJ8w= - golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= + golang.org/x/crypto v0.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54= + golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w= golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c= diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go -index 06e40b9cd3d906ee0d956f050a6568b3b6ea2999..926a533c9c1fb891760f51e2b8c7b48031d618c4 100644 +index a27c0239ce41d9894801ae1aad660adb1280df46..b2d58cc0ab49ca7923de2cc26c0292e68520c388 100644 --- a/src/go/build/deps_test.go +++ b/src/go/build/deps_test.go -@@ -154,6 +154,13 @@ var depsRules = ` +@@ -155,6 +155,13 @@ var depsRules = ` < internal/syscall/execenv < SYSCALL; @@ -2872,7 +2872,7 @@ index 06e40b9cd3d906ee0d956f050a6568b3b6ea2999..926a533c9c1fb891760f51e2b8c7b480 # TIME is SYSCALL plus the core packages about time, including context. SYSCALL < time/tzdata -@@ -546,16 +553,46 @@ var depsRules = ` +@@ -547,16 +554,46 @@ var depsRules = ` NONE < crypto/internal/boring/sig, crypto/internal/boring/syso; sync/atomic < crypto/internal/boring/bcache; @@ -2924,7 +2924,7 @@ index 06e40b9cd3d906ee0d956f050a6568b3b6ea2999..926a533c9c1fb891760f51e2b8c7b480 < crypto/internal/boring < crypto/boring < crypto/internal/rand -@@ -581,6 +618,10 @@ var depsRules = ` +@@ -582,6 +619,10 @@ var depsRules = ` # CRYPTO-MATH is crypto that exposes math/big APIs - no cgo, net; fmt now ok. @@ -2935,7 +2935,7 @@ index 06e40b9cd3d906ee0d956f050a6568b3b6ea2999..926a533c9c1fb891760f51e2b8c7b480 CRYPTO, FMT, math/big, internal/saferio < crypto/internal/boring/bbig < crypto/internal/fips140cache -@@ -976,7 +1017,7 @@ var buildIgnore = []byte("\n//go:build ignore") +@@ -977,7 +1018,7 @@ var buildIgnore = []byte("\n//go:build ignore") func findImports(pkg string) ([]string, error) { vpkg := pkg @@ -2944,7 +2944,7 @@ index 06e40b9cd3d906ee0d956f050a6568b3b6ea2999..926a533c9c1fb891760f51e2b8c7b480 vpkg = "vendor/" + pkg } dir := filepath.Join(Default.GOROOT, "src", vpkg) -@@ -986,7 +1027,7 @@ func findImports(pkg string) ([]string, error) { +@@ -987,7 +1028,7 @@ func findImports(pkg string) ([]string, error) { } var imports []string var haveImport = map[string]bool{} @@ -50263,7 +50263,7 @@ index 0000000000000000000000000000000000000000..b7ffeea07c6b8d69acc43cc3bce25433 + panic("cryptobackend: not available") +} diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt -index 26fd3c0df44eb0644f4aaf3d74920dc9ea968389..f03ad016a9361cd799cadc66a09744f203703f62 100644 +index 54394baa1f81979f3f6e8474cd6ef5cce0eacc5d..6bcdcb33bccb8654999e0abda01f3161e5cc6d5a 100644 --- a/src/vendor/modules.txt +++ b/src/vendor/modules.txt @@ -1,3 +1,56 @@ @@ -50320,7 +50320,7 @@ index 26fd3c0df44eb0644f4aaf3d74920dc9ea968389..f03ad016a9361cd799cadc66a09744f2 +github.com/microsoft/go/cryptobackend/sha512 +github.com/microsoft/go/cryptobackend/tls12 +github.com/microsoft/go/cryptobackend/tls13 - # golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2 + # golang.org/x/crypto v0.58.0 ## explicit; go 1.26.0 golang.org/x/crypto/chacha20 @@ -33,3 +86,4 @@ golang.org/x/tools/go/gcexportdata diff --git a/patches/0002-Add-crypto-backends.patch b/patches/0002-Add-crypto-backends.patch index 8f690f83c7..eab23db4da 100644 --- a/patches/0002-Add-crypto-backends.patch +++ b/patches/0002-Add-crypto-backends.patch @@ -109,7 +109,7 @@ Subject: [PATCH] Add crypto backends src/hash/example_test.go | 2 + src/hash/marshal_test.go | 4 + src/internal/buildcfg/cfg.go | 2 + - src/internal/buildcfg/cfg_test.go | 49 +++++++++ + src/internal/buildcfg/cfg_test.go | 48 ++++++++ src/internal/buildcfg/exp.go | 22 ++++ src/internal/cfg/cfg.go | 1 + src/internal/platform/supported.go | 10 ++ @@ -117,7 +117,7 @@ Subject: [PATCH] Add crypto backends .../systemcrypto/systemcrypto_test.go | 60 ++++++++++ src/net/lookup_test.go | 3 + src/syscall/syscall_windows.go | 3 + - 113 files changed, 1194 insertions(+), 243 deletions(-) + 113 files changed, 1193 insertions(+), 243 deletions(-) create mode 100644 src/crypto/systemcrypto_nocgo_freebsd.go create mode 100644 src/crypto/systemcrypto_nocgo_linux.go create mode 100644 src/internal/systemcrypto/systemcrypto.go @@ -283,7 +283,7 @@ index ae97882d574eb791ff0bd405e0f2613e3bbbde1a..8b7742f0ae42e0d878dd4382f71b853b staleSpan.done() if debug { diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go -index 1d9d3fc288663c3389d92f0c133aa4afb71d86b2..12a1e07950ef0473c537b4ea79efb0ea5daaecd9 100644 +index 522140f02cb5b4b7d850da43b63701c2c6298420..72193f056298941739753ba5e3d8d98a5576547c 100644 --- a/src/cmd/dist/buildtool.go +++ b/src/cmd/dist/buildtool.go @@ -162,6 +162,7 @@ var bootstrapDirs = []string{ @@ -295,7 +295,7 @@ index 1d9d3fc288663c3389d92f0c133aa4afb71d86b2..12a1e07950ef0473c537b4ea79efb0ea "internal/types/errors", "internal/unsafeheader", diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index 2998a52420ba3189a7cf1e4f887678eb921e4a67..831ca013deaec086c6ce74697f23a5889b9b1473 100644 +index 534f48a10d863179cb1db26337ecc244719ebb1a..dbe5f8cb7c2e676e0cc63f9888c7072927b6791c 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -160,10 +160,12 @@ func (t *tester) run() { @@ -345,7 +345,7 @@ index 2998a52420ba3189a7cf1e4f887678eb921e4a67..831ca013deaec086c6ce74697f23a588 t.registerTest("GOOS=ios on darwin/amd64", &goTest{ variant: "amd64ios", -@@ -1348,12 +1352,11 @@ func (t *tester) registerCgoTests(heading string) { +@@ -1334,12 +1338,11 @@ func (t *tester) registerCgoTests(heading string) { // a C linker warning on Linux. // in function `bio_ip_and_port_to_socket_and_addr': // warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking @@ -359,7 +359,7 @@ index 2998a52420ba3189a7cf1e4f887678eb921e4a67..831ca013deaec086c6ce74697f23a588 // Static linking tests if goos != "android" && p != "netbsd/arm" && !t.msan && !t.asan { // TODO(#56629): Why does this fail on netbsd-arm? -@@ -1888,3 +1891,26 @@ func goexperiments(exps ...string) string { +@@ -1844,3 +1847,26 @@ func goexperiments(exps ...string) string { return existing + strings.Join(exps, ",") } @@ -681,10 +681,10 @@ index 018c808e54de270c39943f01867dd5a04e704caa..5c166f90cb19bb9608b2833aebed23fc buildAndRunTool(ld, ctx, tool, args, runFunc) diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go -index ca1492f78a4b4ca3a644a57ae6ed24533c83dacc..0f1087de98bc3b60b6c7b7c6ea38ef7855bac0c0 100644 +index 4a94e6cf3d21f58343237833bdd453e1bcac8df1..bfdf9b0b81ddd830aacbd759c127f12eeaed303a 100644 --- a/src/cmd/go/script_test.go +++ b/src/cmd/go/script_test.go -@@ -293,6 +293,9 @@ var extraEnvKeys = []string{ +@@ -296,6 +296,9 @@ var extraEnvKeys = []string{ "GO_TESTING_GOTOOLS", // for gccgo testing "GCCGO", // for gccgo testing "GCCGOTOOLDIR", // for gccgo testing @@ -1891,7 +1891,7 @@ index a8d840b17022cc9c8a6d41c8ae6643fd24e9a51e..2a17f7da2d4aaa4dcc4f7c2c2eb30a60 + return false } diff --git a/src/crypto/internal/fips140only/fips140only_test.go b/src/crypto/internal/fips140only/fips140only_test.go -index a940fb2a3a001041c4c773472539896150ada95f..cb0cef671b4070c38e32aa7cc60c65ecd1cc6ba8 100644 +index 43e9520f89967450ab1af68241eacf0c39957115..7cb71d766cd24aebc255b51b82a05ff60f614e82 100644 --- a/src/crypto/internal/fips140only/fips140only_test.go +++ b/src/crypto/internal/fips140only/fips140only_test.go @@ -38,9 +38,12 @@ import ( @@ -1935,7 +1935,7 @@ index a940fb2a3a001041c4c773472539896150ada95f..cb0cef671b4070c38e32aa7cc60c65ec expectPanic(t, func() { sha1.Sum([]byte("foo")) }) withApprovedHash(func(h crypto.Hash) { h.New().Sum(nil) }) -@@ -308,7 +323,7 @@ bXVL8iKLrG91IYQByUHZIn3WVAd2bfi4MfKagRt0ggd4 +@@ -332,7 +347,7 @@ bXVL8iKLrG91IYQByUHZIn3WVAd2bfi4MfKagRt0ggd4 // fips140=only mode should prevent any operation that would make the FIPS // 140-3 module set its service indicator to false. @@ -2451,7 +2451,7 @@ index c4d2b0d382e7fc6f095cf986c51917a67096a160..b2b61721e9d340309261163acb36cdd4 return } diff --git a/src/crypto/rsa/fips.go b/src/crypto/rsa/fips.go -index e756512fecd6d5c82a8d583b4cbe19b4e7e0a202..e95f373343ce26ea9c78e3ff289138f528938200 100644 +index f6549c098c92384308a69d674a537ba7275bf3a1..86a162eb860d6bcf2f4f3ffe724e80b494be70f0 100644 --- a/src/crypto/rsa/fips.go +++ b/src/crypto/rsa/fips.go @@ -7,13 +7,14 @@ package rsa @@ -3600,10 +3600,10 @@ index 2b176c1a5e233733561467c7702c567117336545..f801e63090d2a834ded8d400ca39c167 var dsaPriv dsa.PrivateKey diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go -index 926a533c9c1fb891760f51e2b8c7b48031d618c4..9b8ae5131f3735113af2d3f9c9e2342a23df08d8 100644 +index b2d58cc0ab49ca7923de2cc26c0292e68520c388..01d82ea4c34507d570d0ccb723d1138b8d6540e6 100644 --- a/src/go/build/deps_test.go +++ b/src/go/build/deps_test.go -@@ -377,8 +377,10 @@ var depsRules = ` +@@ -378,8 +378,10 @@ var depsRules = ` math/big, go/token < go/constant; @@ -3615,7 +3615,7 @@ index 926a533c9c1fb891760f51e2b8c7b48031d618c4..9b8ae5131f3735113af2d3f9c9e2342a # The vast majority of standard library packages should not be resorting to regexp. # go/types is a good chokepoint. It shouldn't use regexp, nor should anything -@@ -543,7 +545,7 @@ var depsRules = ` +@@ -544,7 +546,7 @@ var depsRules = ` < crypto/internal/fips140/edwards25519 < crypto/internal/fips140/ed25519 < crypto/internal/fips140/rsa @@ -3624,7 +3624,7 @@ index 926a533c9c1fb891760f51e2b8c7b48031d618c4..9b8ae5131f3735113af2d3f9c9e2342a crypto !< FIPS; -@@ -563,10 +565,27 @@ var depsRules = ` +@@ -564,10 +566,27 @@ var depsRules = ` < github.com/microsoft/go-crypto-winnative/internal/sysdll < github.com/microsoft/go-crypto-winnative/internal/bcrypt; @@ -3654,7 +3654,7 @@ index 926a533c9c1fb891760f51e2b8c7b48031d618c4..9b8ae5131f3735113af2d3f9c9e2342a < crypto/cipher; crypto, crypto/subtle, hash, crypto/cipher, -@@ -583,6 +602,39 @@ var depsRules = ` +@@ -584,6 +603,39 @@ var depsRules = ` github.com/microsoft/go-crypto-winnative/internal/bcrypt < github.com/microsoft/go-crypto-winnative/cng; @@ -3694,7 +3694,7 @@ index 926a533c9c1fb891760f51e2b8c7b48031d618c4..9b8ae5131f3735113af2d3f9c9e2342a FIPS, internal/godebug, embed, crypto/internal/boring/sig, crypto/internal/boring/syso, -@@ -590,7 +642,9 @@ var depsRules = ` +@@ -591,7 +643,9 @@ var depsRules = ` crypto/internal/fips140only, crypto, crypto/subtle, @@ -3705,7 +3705,7 @@ index 926a533c9c1fb891760f51e2b8c7b48031d618c4..9b8ae5131f3735113af2d3f9c9e2342a < crypto/sha3 < crypto/internal/fips140hash < crypto/internal/boring -@@ -605,15 +659,15 @@ var depsRules = ` +@@ -606,15 +660,15 @@ var depsRules = ` crypto/sha512, crypto/hmac, crypto/hkdf, @@ -3725,7 +3725,7 @@ index 926a533c9c1fb891760f51e2b8c7b48031d618c4..9b8ae5131f3735113af2d3f9c9e2342a CGO, fmt, net !< CRYPTO; # CRYPTO-MATH is crypto that exposes math/big APIs - no cgo, net; fmt now ok. -@@ -622,15 +676,33 @@ var depsRules = ` +@@ -623,15 +677,33 @@ var depsRules = ` math/big, github.com/microsoft/go-crypto-darwin/xcrypto < github.com/microsoft/go-crypto-darwin/bbig; math/big, github.com/microsoft/go-crypto-winnative/cng < github.com/microsoft/go-crypto-winnative/cng/bbig; @@ -3762,7 +3762,7 @@ index 926a533c9c1fb891760f51e2b8c7b48031d618c4..9b8ae5131f3735113af2d3f9c9e2342a < crypto/ecdsa < CRYPTO-MATH; -@@ -658,13 +730,15 @@ var depsRules = ` +@@ -659,13 +731,15 @@ var depsRules = ` < golang.org/x/crypto/internal/subtle < golang.org/x/crypto/chacha20 < golang.org/x/crypto/internal/poly1305 @@ -3830,19 +3830,18 @@ index 3ebd93058886fa1830b87c2841d6aecbe402a50e..227b9f0144f2a280bfa6e7294f70e18d var Error error diff --git a/src/internal/buildcfg/cfg_test.go b/src/internal/buildcfg/cfg_test.go -index 34313cad82b2bb973c12123ec442a9544c33aacd..a47171a592c9c8420d703f270a8507c973c76cf5 100644 +index 0452a6361e151f44d0419b177fe2112908343f5c..570d000124bad1685ed9a7fc1a99d019d345b329 100644 --- a/src/internal/buildcfg/cfg_test.go +++ b/src/internal/buildcfg/cfg_test.go -@@ -6,6 +6,8 @@ package buildcfg - - import ( +@@ -8,6 +8,7 @@ import ( "os" + "path/filepath" + "runtime" + "slices" -+ "strings" + "strings" "testing" ) - -@@ -137,6 +139,53 @@ func TestGogoarchTags(t *testing.T) { +@@ -140,6 +141,53 @@ func TestGogoarchTags(t *testing.T) { GOARM64 = old_goarm64 } diff --git a/patches/index.json b/patches/index.json index 4a06554ad1..00eb631d8b 100644 --- a/patches/index.json +++ b/patches/index.json @@ -1,6 +1,6 @@ { "0001-Vendor-external-dependencies.patch": { - "patchSHA256": "0ad3a02c78ea6031114f093fbb44d0ec65aae4a3226448eab7355fb0dd65155b", + "patchSHA256": "20064798fed681e1838a51bac4a6d4eeb0b5d8896eadb9ab55b84a74fe9109e3", "indexLines": { "1002": "index 0000000000000000000000000000000000000000..bb3188f26ead88cdb6afeea1c182d450e4af8296", "10056": "index 0000000000000000000000000000000000000000..1714b9b050a0f3cccbe3fc8690f35b2fde61c334", @@ -139,15 +139,15 @@ "27073": "index 0000000000000000000000000000000000000000..a5d005176e63f96e7c8f3b04dcc5034a7423ab08", "27093": "index 0000000000000000000000000000000000000000..410829738931c7c444099696b9375f03a6866e76", "27251": "index 0000000000000000000000000000000000000000..cea68389f03af12d9e4822184a1c594e53bfe6e0", - "2753": "index 0be16ea83c91cc064475a718c62cc8cba5e3df5f..75196e88ef084b35027247a9c20f8c01c4fc3dfc 100644", + "2753": "index 3b94cfb7fcbb55d87beea9a57032bcea333064f8..7d3d6d6ef9b3b49dda2c1a0305a21c4a1f6431f7 100644", "2776": "index 0000000000000000000000000000000000000000..ab958419731f59c42d1ae2210dd94b0638aa2e63", "27952": "index 0000000000000000000000000000000000000000..de1d5afee901fa16d8eb32b8f74ecbc9a7f46bfe", "28075": "index 0000000000000000000000000000000000000000..ece9605829f12dbd1af5c814ed134d2267cce497", - "2821": "index 12b6b39c9e4cf8c4315083c57d41d759c2878eee..747dbcbab927cafae692607929c6662d0acf537b 100644", + "2821": "index fd6f45f3edfb70d79fe2563180cbd9df9d41774d..0a3838a367e100fa2ffa1645d0c99f1558d8198f 100644", "28337": "index 0000000000000000000000000000000000000000..6ae4a6372f8d08d2aaf3b7cc2ad2a947e77d0431", - "2844": "index 4d2c4120ca2482bc9543576c7e585fa933c17a96..457211e6e8efeb349f5250a1d88583c2140d67ac 100644", + "2844": "index 895e0c0db54fbfa63ecbe491ecdf83e3554c78cf..3e21b9cad3d4713db7c73ceeaf4a121a2f08dae3 100644", "28464": "index 0000000000000000000000000000000000000000..292456d19eb32d2bd59e652718d3c197bfef3c62", - "2858": "index 06e40b9cd3d906ee0d956f050a6568b3b6ea2999..926a533c9c1fb891760f51e2b8c7b48031d618c4 100644", + "2858": "index a27c0239ce41d9894801ae1aad660adb1280df46..b2d58cc0ab49ca7923de2cc26c0292e68520c388 100644", "28766": "index 0000000000000000000000000000000000000000..d871a04b37942baf51bdccafdf7e3616b6d3f002", "28904": "index 0000000000000000000000000000000000000000..c7bb9437f22a47dfb866d0c40733ef6ca385d730", "29241": "index 0000000000000000000000000000000000000000..1fe54d5813aa92c3bbf187db5299cf03f8da14af", @@ -426,7 +426,7 @@ "50203": "index 0000000000000000000000000000000000000000..b7ffeea07c6b8d69acc43cc3bce25433ff470254", "50223": "index 0000000000000000000000000000000000000000..29d97cd38cb6bc0ec330645f9a08473599c60e33", "50247": "index 0000000000000000000000000000000000000000..b7ffeea07c6b8d69acc43cc3bce25433ff470254", - "50266": "index 26fd3c0df44eb0644f4aaf3d74920dc9ea968389..f03ad016a9361cd799cadc66a09744f203703f62 100644", + "50266": "index 54394baa1f81979f3f6e8474cd6ef5cce0eacc5d..6bcdcb33bccb8654999e0abda01f3161e5cc6d5a 100644", "5913": "index 0000000000000000000000000000000000000000..b43df0b67d646bd219a126f31d1527c637166b57", "5927": "index 0000000000000000000000000000000000000000..e134697ed96de7afc99b8d68dc425c45ee890e4f", "5943": "index 0000000000000000000000000000000000000000..520dd2195783d42051412afd8003903e2a60f11b", @@ -446,9 +446,9 @@ "8835": "index 0000000000000000000000000000000000000000..41aa0341b8a2b27b498572499c9d2735483516a8", "8862": "index 0000000000000000000000000000000000000000..8a2524b3cd0fe61662a9c86ec74de7b99d4f6e10", "8966": "index 0000000000000000000000000000000000000000..be8c1f62796554b8cf785d0db546aa6bbb5d9127", - "908": "index b69ed87ac99bf9593c39acc552531be06a65732d..ae62d9236d9ce1eba905dac66ecaf72ae200f54e 100644", + "908": "index 76efe2fda45481e8c510594708987859c0e1e498..e3fc261a6b72639404f33143e1eb52687da43239 100644", "9143": "index 0000000000000000000000000000000000000000..c17b764ee906620d7b949dee459dace255860b9c", - "921": "index 550a982c5176cd004dcf3e2bce8268207eee7882..87cd25594e6fb263d408e6b22b0a2dc00cb8f6c0 100644", + "921": "index 5a824a7a3bc6a80346e09e435f2f6e9e11202db8..1f076d7080ac5fc87b78429715e7bf6ff11fc033 100644", "937": "index 0000000000000000000000000000000000000000..d3155d34977b32e3d41350c03d4c4ee6a1f0f126", "9537": "index 0000000000000000000000000000000000000000..4485d6da3454cfd080a4c277e84ed5cbf16d39d6", "960": "index 0000000000000000000000000000000000000000..9e841e7a26e4eb057b24511e7b92d42b257a80e5", @@ -456,7 +456,7 @@ } }, "0002-Add-crypto-backends.patch": { - "patchSHA256": "a838d5b0a0c4deae7d890a23650fad87027c7d467580251838dd61a09be76ea4", + "patchSHA256": "76e131a2df581a67ceb30c7041fb2c47630e1428eb9b696ec547604e2c65689c", "indexLines": { "1014": "index cfe75f4057a96bf49f7748d556b99c6bdad116c6..c7938ea24ee54341af5ea6fdb5c57fe7beab5d67 100644", "1029": "index 87bafee08ade4f7eb55ee5eaab21366ef6c8df5e..f5faf803bd03c616659de9eca6331642e0d60dc4 100644", @@ -486,7 +486,7 @@ "1829": "index 6d67ee8b3429a14c0481f5c80a08bae7ae8b2a78..67e7a76a2602b2b5440d96eb2d307d7479aa4cd9 100644", "1869": "index a8d840b17022cc9c8a6d41c8ae6643fd24e9a51e..2a17f7da2d4aaa4dcc4f7c2c2eb30a60b057a07a 100644", "189": "index 9ec997a138f0f27be42882b819a1531f63600394..09c4e7955ec162ab5092619880b50dbc1b43bba6 100644", - "1894": "index a940fb2a3a001041c4c773472539896150ada95f..cb0cef671b4070c38e32aa7cc60c65ecd1cc6ba8 100644", + "1894": "index 43e9520f89967450ab1af68241eacf0c39957115..7cb71d766cd24aebc255b51b82a05ff60f614e82 100644", "1948": "index 333dee95e3327c80b8aa1e33e592fa40d458d1f8..9ce843895fc60e1db6705a330875c53156239620 100644", "1972": "index 99eab7e5de91e43838470d62fc766510d999f2d8..e5b36643ae9702c6307b9c7d8fc9f516bfb4d937 100644", "1992": "index 02f9f735ab7e012bc315180aad9e5b42e436c569..6d82571a2f9cd3d5a60cfe6f27eb7efd2c3fce10 100644", @@ -503,7 +503,7 @@ "2346": "index 018fe013cef6005780026fb9cb6bc4fbde3d3cc5..729c0d4348a0d64a8a28ec5a2c6e1b7d5e015b92 100644", "2364": "index 596f6d434065fdc7eeabbccd8f2e17ee8603a5a6..e67ec4618acf8759c12d23d0f9397a9689d6b352 100644", "2396": "index c4d2b0d382e7fc6f095cf986c51917a67096a160..b2b61721e9d340309261163acb36cdd428603dbe 100644", - "2454": "index e756512fecd6d5c82a8d583b4cbe19b4e7e0a202..e95f373343ce26ea9c78e3ff289138f528938200 100644", + "2454": "index f6549c098c92384308a69d674a537ba7275bf3a1..86a162eb860d6bcf2f4f3ffe724e80b494be70f0 100644", "2474": "index bfe7346fc67c546006ee0579e688e44c50fd8c15..fd23566a0cd4302eaee09a1c49b50f5d00d3197c 100644", "2493": "index 93e08ed6cd8f7183b77c5e06c42cce57e89b5020..ecdedee5f3e3dbece754da466310bdecf2a25661 100644", "2577": "index cdcd6db86469a85868a1c44b8b3fee5ad8fee57b..598269b2b4e0e8483622b61d4a46b7e2835cb6ff 100644", @@ -511,10 +511,10 @@ "2670": "index 745dce5c9ff1588a0aa2e5b2311a7b2d108cd850..e75dabb589cb968c0fa1f4002d46e8f577cd036a 100644", "2725": "index 069938a22dbc5a12270e281c81bd151ab00f9b5f..42c8d262752bf4a436df3098cf5dd7894360f462 100644", "2764": "index a18a536ba2896f8d58d715f0d81473bbd969c1e4..7cd0da8cad4727af4fa9238d2da7974c7be53768 100644", - "286": "index 1d9d3fc288663c3389d92f0c133aa4afb71d86b2..12a1e07950ef0473c537b4ea79efb0ea5daaecd9 100644", + "286": "index 522140f02cb5b4b7d850da43b63701c2c6298420..72193f056298941739753ba5e3d8d98a5576547c 100644", "2878": "index f7c5549ddd113c53b316e3a325201661c618ec90..529ecd6ae9588acbe8863842cb1f267eb33bfed9 100644", "2961": "index 3973e0afd1b935e0ab2f5b631f44a43cb7cd68b9..356e207a8f78249a31bcfa69f9c921b5d53d2ae5 100644", - "298": "index 2998a52420ba3189a7cf1e4f887678eb921e4a67..831ca013deaec086c6ce74697f23a5889b9b1473 100644", + "298": "index 534f48a10d863179cb1db26337ecc244719ebb1a..dbe5f8cb7c2e676e0cc63f9888c7072927b6791c 100644", "3051": "index 1435eac1f5b5dc0646b6208d0694ec3d68d4ac35..0d0fbabb2eb42ecd12cf841056b24d90dc70a4a0 100644", "3110": "index 214b8686db9ffe31b1c3ba050069f8da511a114e..a399c8aec3221cdfeb71505cf3a0b89abc55603d 100644", "3223": "index 0000000000000000000000000000000000000000..8f96d3a08cc0eec97972f15f17f9cd784d90de3d", @@ -532,27 +532,27 @@ "3521": "index 652a6489b899d645334bda4aaac6ab10dc33cd9d..f25da189bf72c991c8de249dab63574c4ff15d6c 100644", "3539": "index bc59300f41c762c466e3bd043fd5ee498e3f81dc..698bc79a80aeadbc266f250887a9ef073b7365ab 100644", "3590": "index 2b176c1a5e233733561467c7702c567117336545..f801e63090d2a834ded8d400ca39c167401e911c 100644", - "3603": "index 926a533c9c1fb891760f51e2b8c7b48031d618c4..9b8ae5131f3735113af2d3f9c9e2342a23df08d8 100644", + "3603": "index b2d58cc0ab49ca7923de2cc26c0292e68520c388..01d82ea4c34507d570d0ccb723d1138b8d6540e6 100644", "3785": "index f07b9aaa2c4898b5765ba66da0faf6cf48fa4e42..b380537215634df9ff686850a9c58b224eeb10be 100644", "3798": "index 3091f7a67acedeaf72fd3851cf295c1e7bd88e8f..fa3f0fd82cfd30069756b0a41e3f909763a8bde6 100644", "3820": "index 3ebd93058886fa1830b87c2841d6aecbe402a50e..227b9f0144f2a280bfa6e7294f70e18d4833e0c4 100644", - "3833": "index 34313cad82b2bb973c12123ec442a9544c33aacd..a47171a592c9c8420d703f270a8507c973c76cf5 100644", + "3833": "index 0452a6361e151f44d0419b177fe2112908343f5c..570d000124bad1685ed9a7fc1a99d019d345b329 100644", + "3899": "index 0ede05787de83f7e775bbef532a8d9296bd09c2f..ce3a0ee6a841c429e724503baae935b3edd16737 100644", "390": "index 5343762633aafa30d6d2eebb45b4a24a51950b15..2ff19983542a25525cdd6709fc98276532b2965f 100644", - "3900": "index 0ede05787de83f7e775bbef532a8d9296bd09c2f..ce3a0ee6a841c429e724503baae935b3edd16737 100644", - "3953": "index 9329769721b7debfa20f3a2f04b6361939c7ea62..1724afb71b851e1f267b48896cc12dfe28d7530f 100644", - "3964": "index 86dc5ae15b56bbe9ebd3fc213bff7e444f7712f2..e54c1ac580cce130bd08043d6f90bfacd94721a7 100644", - "3983": "index 0000000000000000000000000000000000000000..71c1923a270646b39346ed2824335506d9cde818", - "4009": "index 0000000000000000000000000000000000000000..5cf11348f881dc6988d58be62959df49d947c674", + "3952": "index 9329769721b7debfa20f3a2f04b6361939c7ea62..1724afb71b851e1f267b48896cc12dfe28d7530f 100644", + "3963": "index 86dc5ae15b56bbe9ebd3fc213bff7e444f7712f2..e54c1ac580cce130bd08043d6f90bfacd94721a7 100644", + "3982": "index 0000000000000000000000000000000000000000..71c1923a270646b39346ed2824335506d9cde818", + "4008": "index 0000000000000000000000000000000000000000..5cf11348f881dc6988d58be62959df49d947c674", "404": "index c7acc7dd0b98490043d8fd15ff4d690c580ebfb6..8f94ea4b7dd4b62e866d28a7895cb6f7a3659b1e 100644", - "4074": "index efe93d77d1a424b5319c60315e5d4e597e5bc81c..439e9116941ee2fcde8170d90e57163915df5551 100644", - "4088": "index 3a82d7c1b983eefc15d8c75d39d09c4a1374b18c..f646504c244431bba951d2a1dce77865561fdaac 100644", + "4073": "index efe93d77d1a424b5319c60315e5d4e597e5bc81c..439e9116941ee2fcde8170d90e57163915df5551 100644", + "4087": "index 3a82d7c1b983eefc15d8c75d39d09c4a1374b18c..f646504c244431bba951d2a1dce77865561fdaac 100644", "417": "index a38198345b6c1402d0953aab630255af55a69b76..b178010181a8ab0f510fe11b7018ebb487fa5ef8 100644", "453": "index 5c34612f5d2a952c8d413406384c9e68959314db..43d9fea576d302feaae6a0545b95f65490f1b2f2 100644", "518": "index e648110e0136a8496ac8b2cb5ee46f0e9d85e027..c8e949c5e933ec6cabc4856ba80b66b0912285bf 100644", "539": "index b305457a23d1045a4e00a99b91f7e03fa65330a4..5154aa0be0007ce0c842e666f8923cd47c1a5d22 100644", "553": "index 56ad32276bb0599818d95daa8b573374636491e1..b3fab4bd0f358fa6f2f5f780483f7d6122340714 100644", "656": "index 018c808e54de270c39943f01867dd5a04e704caa..5c166f90cb19bb9608b2833aebed23fc3b75eca7 100644", - "684": "index ca1492f78a4b4ca3a644a57ae6ed24533c83dacc..0f1087de98bc3b60b6c7b7c6ea38ef7855bac0c0 100644", + "684": "index 4a94e6cf3d21f58343237833bdd453e1bcac8df1..bfdf9b0b81ddd830aacbd759c127f12eeaed303a 100644", "698": "index cd0484243fdeed1f0f20bd34dbf05d442becc360..62e821defaf12c007315ac438a23a8860c673b88 100644", "711": "index fa445925b7c3740d9d694f55053c68cf679f58dc..248be5160833c1edc79a20382299f16ab1b9bab7 100644", "723": "index da9560062704e60923d1d72898d1e3a52099343f..a12836ff65fd0317d123662661c2ac158251b9ee 100644", @@ -578,7 +578,7 @@ "indexLines": { "17": "index 6ff2b921d464bc64266c9d84a67a33fb5505d216..36c3bdfc9b6087c316713ca18262832791ebb939 100644", "32": "index 43d9fea576d302feaae6a0545b95f65490f1b2f2..fc8077bae22c9a2e829ad4357ecdccad53216c3a 100644", - "61": "index 0f1087de98bc3b60b6c7b7c6ea38ef7855bac0c0..ae3d71d3af5fd86c6e99dc72f994ae8957c93410 100644" + "61": "index bfdf9b0b81ddd830aacbd759c127f12eeaed303a..1351b13be2c42f57de737509bb8e5ce3daf2e414 100644" } }, "0004-Add-support-for-logging-used-Windows-APIs.patch": { @@ -610,7 +610,7 @@ "150": "index 978026637fd36e4dac4ef3ddb347f98a837fbb75..cfec8e9fca0d3c820f2199f71c12ef35c05ccef9 100644", "205": "index 0000000000000000000000000000000000000000..010270fb6ad4cfb555fd804dbd5f3ed5d4e28d64", "25": "index 71c9d1dc2993880f38d227085d1b48c4070d1e85..8cab5daec4da543a7683835e0c9dd294c34a28b7 100644", - "266": "index ae3d71d3af5fd86c6e99dc72f994ae8957c93410..e9401493e0c535d260f45dfa4060eb3653edd18b 100644", + "266": "index 1351b13be2c42f57de737509bb8e5ce3daf2e414..cd98ee0513de4fc357c6f0619cc07dc7dc0220bf 100644", "300": "index 8195e830caa31b9767a65033e1fb11f9067e410f..882aeecfa562b99de02a7e21155092f4a62483db 100644", "340": "index 2d76ba3c2ef0588eaf9ea83267bea87cb729676f..927a15a30abdf8768506b771148692f61e0f5677 100644", "364": "index 5cef0b0041551a6b04fa8227016df3ea71534f1d..4819d8969a667fddb7d80f36e7194cd5632d2f21 100644", @@ -687,7 +687,7 @@ "39": "index 7dddd0e38051792a091938826f6d06466069690c..7185514a12460c87ac4228956705a5fc41a92254 100644", "52": "index 0000000000000000000000000000000000000000..301e9f40ede9bf3468528b15371a1ef9b1123c09", "59": "index 0000000000000000000000000000000000000000..1bb294d4ea5af98738371e43673ef2f2741f7f08", - "70": "index 21fd3e4c0cc1e810762c3bef3370b30cbdc7a83a..b134fe148c521558dea32e105cc7b70c5843567b 100644" + "70": "index 9c47d897934c982dd062f6f92f0432cb7ac5b66f..2759138ca5f4d7330f672c453fd7ae18c7e8350f 100644" } }, "0013-Add-MS_GOTLSMLKEM-build-time-setting.patch": { From 35a98362f59438e2f3e6d1113ca6cb9826a914a0 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 28 Oct 2026 16:35:08 +0000 Subject: [PATCH 3/3] update cryptobackend --- cryptobackend/go.mod | 4 ++-- cryptobackend/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cryptobackend/go.mod b/cryptobackend/go.mod index d87b0dbfc9..258bd7f12e 100644 --- a/cryptobackend/go.mod +++ b/cryptobackend/go.mod @@ -6,7 +6,7 @@ require ( github.com/microsoft/go-crypto-darwin v0.0.3-0.20261026090017-171c4346c8c7 github.com/microsoft/go-crypto-openssl v0.5.1-0.20261026090129-f83222ce3a39 github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832 - golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2 + golang.org/x/crypto v0.58.0 ) -require golang.org/x/sys v0.48.0 // indirect +require golang.org/x/sys v0.49.0 // indirect diff --git a/cryptobackend/go.sum b/cryptobackend/go.sum index 4bafb6b94c..f92f5617f0 100644 --- a/cryptobackend/go.sum +++ b/cryptobackend/go.sum @@ -4,7 +4,7 @@ github.com/microsoft/go-crypto-openssl v0.5.1-0.20261026090129-f83222ce3a39 h1:v github.com/microsoft/go-crypto-openssl v0.5.1-0.20261026090129-f83222ce3a39/go.mod h1:rdSY8BhWs3fySEKPnwYbTbCAWxnXQAfrE8qBibXNU/M= github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832 h1:j9iNaPbnm5YcNqOxBbOFzvRhzKdnYRTVsTGUjAcZhxk= github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832/go.mod h1:ic6qQ5ko8bzigvuQbGMknZ4WzS4/KDQ9cypGMdqn38s= -golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2 h1:S2kz2UVkb4BhxS9tvxdkfNT6T8NqtaUQE+qv1ObhJ8w= -golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= -golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= -golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/crypto v0.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54= +golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w= +golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= +golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=