diff --git a/VERSION b/VERSION index 153abbf6995..e7cf4b436fe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -go1.21.9 \ No newline at end of file +go1.21.10 \ No newline at end of file diff --git a/go b/go index d8392e69973..752b009010d 160000 --- a/go +++ b/go @@ -1 +1 @@ -Subproject commit d8392e69973a64d96534d544d1f8ac2defc1bc64 +Subproject commit 752b009010df021c45f620e683ec062d22b552bf diff --git a/patches/0004-Add-OpenSSL-crypto-backend.patch b/patches/0004-Add-OpenSSL-crypto-backend.patch index 05ae2a760c2..279c830bde1 100644 --- a/patches/0004-Add-OpenSSL-crypto-backend.patch +++ b/patches/0004-Add-OpenSSL-crypto-backend.patch @@ -581,7 +581,7 @@ index c83a7272c9f01f..a0548a7f9179c5 100644 package x509 diff --git a/src/go.mod b/src/go.mod -index b6470514f12796..fd10cbd7e17b05 100644 +index 01d759c800d4b5..bd3320498ec5d0 100644 --- a/src/go.mod +++ b/src/go.mod @@ -3,6 +3,7 @@ module std @@ -590,10 +590,10 @@ index b6470514f12796..fd10cbd7e17b05 100644 require ( + github.com/microsoft/go-crypto-openssl v0.2.9 golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d - golang.org/x/net v0.12.1-0.20240327214420-1a2eef3ba536 + golang.org/x/net v0.12.1-0.20240412193743-ef58d90fdfc5 ) diff --git a/src/go.sum b/src/go.sum -index 670b76cde031bd..0e293cc0379d0a 100644 +index f83343a0a1ac9f..2bc44ee9e1bf8b 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,3 +1,5 @@ @@ -601,7 +601,7 @@ index 670b76cde031bd..0e293cc0379d0a 100644 +github.com/microsoft/go-crypto-openssl v0.2.9/go.mod h1:xOSmQnWz4xvNB2+KQN2g2UUwMG9vqDHBk9nk/NdmyRw= golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d h1:LiA25/KWKuXfIq5pMIBq1s5hz3HQxhJJSu/SUGlD+SM= golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= - golang.org/x/net v0.12.1-0.20240327214420-1a2eef3ba536 h1:QEPT0Le4+itOUqHbs7yUz5y7FoAOuK1ibDlfTcVguHM= + golang.org/x/net v0.12.1-0.20240412193743-ef58d90fdfc5 h1:BIx9jz/hjPE1CesqfHzRaf2JsOjDxZrKAVr//XXJh0U= diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go index 63751beca3892b..a158d645f30368 100644 --- a/src/go/build/deps_test.go diff --git a/patches/0005-Add-CNG-crypto-backend.patch b/patches/0005-Add-CNG-crypto-backend.patch index 94f25836694..bf88032504c 100644 --- a/patches/0005-Add-CNG-crypto-backend.patch +++ b/patches/0005-Add-CNG-crypto-backend.patch @@ -1028,7 +1028,7 @@ index a0548a7f9179c5..ae6117a1554b7f 100644 package x509 diff --git a/src/go.mod b/src/go.mod -index fd10cbd7e17b05..46f2993a48ff1a 100644 +index bd3320498ec5d0..9ba1ae4256d5ff 100644 --- a/src/go.mod +++ b/src/go.mod @@ -4,6 +4,7 @@ go 1.21 @@ -1037,10 +1037,10 @@ index fd10cbd7e17b05..46f2993a48ff1a 100644 github.com/microsoft/go-crypto-openssl v0.2.9 + github.com/microsoft/go-crypto-winnative v0.0.0-20240109184443-a968e40d3103 golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d - golang.org/x/net v0.12.1-0.20240327214420-1a2eef3ba536 + golang.org/x/net v0.12.1-0.20240412193743-ef58d90fdfc5 ) diff --git a/src/go.sum b/src/go.sum -index 0e293cc0379d0a..04e31422bde5aa 100644 +index 2bc44ee9e1bf8b..ea6d7868d4a7d0 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,5 +1,7 @@ @@ -1050,7 +1050,7 @@ index 0e293cc0379d0a..04e31422bde5aa 100644 +github.com/microsoft/go-crypto-winnative v0.0.0-20240109184443-a968e40d3103/go.mod h1:fveERXKbeK+XLmOyU24caKnIT/S5nniAX9XCRHfnrM4= golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d h1:LiA25/KWKuXfIq5pMIBq1s5hz3HQxhJJSu/SUGlD+SM= golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= - golang.org/x/net v0.12.1-0.20240327214420-1a2eef3ba536 h1:QEPT0Le4+itOUqHbs7yUz5y7FoAOuK1ibDlfTcVguHM= + golang.org/x/net v0.12.1-0.20240412193743-ef58d90fdfc5 h1:BIx9jz/hjPE1CesqfHzRaf2JsOjDxZrKAVr//XXJh0U= diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go index a158d645f30368..1dd4e398e9b2be 100644 --- a/src/go/build/deps_test.go