Skip to content

Commit 2a58c29

Browse files
author
microsoft-golang-review-bot
authored
Merge pull request #1078 from microsoft/dev/auto-sync/microsoft/release-branch.go1.21
Update submodule to latest `release-branch.go1.21` in `microsoft/release-branch.go1.21`
2 parents 56fdab8 + 3379a17 commit 2a58c29

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
go1.21.3
1+
go1.21.4

patches/0004-Add-OpenSSL-crypto-backend.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ index 4aaf46b5d0f0dc..e2ac54f96db1e8 100644
106106

107107
go list -f '{{.Dir}}' vendor/golang.org/x/net/http2/hpack
108108
diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
109-
index d9e5774b6021d1..6a433d2ec7d45f 100644
109+
index 5e5d255b058414..10efb50bd55ad5 100644
110110
--- a/src/cmd/link/internal/ld/lib.go
111111
+++ b/src/cmd/link/internal/ld/lib.go
112112
@@ -1151,6 +1151,7 @@ var hostobj []Hostobj
@@ -580,7 +580,7 @@ index c83a7272c9f01f..a0548a7f9179c5 100644
580580
package x509
581581

582582
diff --git a/src/go.mod b/src/go.mod
583-
index 25829e17f2dd9e..d128b580b6445f 100644
583+
index 3b24053b94da17..7037a89880f11a 100644
584584
--- a/src/go.mod
585585
+++ b/src/go.mod
586586
@@ -3,6 +3,7 @@ module std
@@ -589,20 +589,20 @@ index 25829e17f2dd9e..d128b580b6445f 100644
589589
require (
590590
+ github.com/microsoft/go-crypto-openssl v0.2.8
591591
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d
592-
golang.org/x/net v0.12.1-0.20230712162946-57553cbff163
592+
golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c
593593
)
594594
diff --git a/src/go.sum b/src/go.sum
595-
index e474b8be318c84..ee90dede95cd4d 100644
595+
index caf8ff010daafd..a9054cd98bd29f 100644
596596
--- a/src/go.sum
597597
+++ b/src/go.sum
598598
@@ -1,3 +1,5 @@
599599
+github.com/microsoft/go-crypto-openssl v0.2.8 h1:16B6DVeBCimOAG0B92PSySOnVDq6Qr/siI3TyyMHXoI=
600600
+github.com/microsoft/go-crypto-openssl v0.2.8/go.mod h1:xOSmQnWz4xvNB2+KQN2g2UUwMG9vqDHBk9nk/NdmyRw=
601601
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d h1:LiA25/KWKuXfIq5pMIBq1s5hz3HQxhJJSu/SUGlD+SM=
602602
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
603-
golang.org/x/net v0.12.1-0.20230712162946-57553cbff163 h1:1EDKNuaCsog7zGLEml1qRuO4gt23jORUQX2f0IKZ860=
603+
golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c h1:d+VvAxu4S13DWtf73R5eY//VaCk3aUcVdyYjM1SX7zw=
604604
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
605-
index f213bd91903a71..b494e234d1fe1e 100644
605+
index 63751beca3892b..a158d645f30368 100644
606606
--- a/src/go/build/deps_test.go
607607
+++ b/src/go/build/deps_test.go
608608
@@ -425,6 +425,8 @@ var depsRules = `

patches/0005-Add-CNG-crypto-backend.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ index a0548a7f9179c5..ae6117a1554b7f 100644
10241024
package x509
10251025

10261026
diff --git a/src/go.mod b/src/go.mod
1027-
index d128b580b6445f..fde1cd866ab8f4 100644
1027+
index 7037a89880f11a..1dfa2df1f0ca79 100644
10281028
--- a/src/go.mod
10291029
+++ b/src/go.mod
10301030
@@ -4,6 +4,7 @@ go 1.21
@@ -1033,10 +1033,10 @@ index d128b580b6445f..fde1cd866ab8f4 100644
10331033
github.com/microsoft/go-crypto-openssl v0.2.8
10341034
+ github.com/microsoft/go-crypto-winnative v0.0.0-20230502061212-6eb98854418e
10351035
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d
1036-
golang.org/x/net v0.12.1-0.20230712162946-57553cbff163
1036+
golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c
10371037
)
10381038
diff --git a/src/go.sum b/src/go.sum
1039-
index ee90dede95cd4d..88246d9a2e2442 100644
1039+
index a9054cd98bd29f..4839faec6628bd 100644
10401040
--- a/src/go.sum
10411041
+++ b/src/go.sum
10421042
@@ -1,5 +1,7 @@
@@ -1046,9 +1046,9 @@ index ee90dede95cd4d..88246d9a2e2442 100644
10461046
+github.com/microsoft/go-crypto-winnative v0.0.0-20230502061212-6eb98854418e/go.mod h1:fveERXKbeK+XLmOyU24caKnIT/S5nniAX9XCRHfnrM4=
10471047
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d h1:LiA25/KWKuXfIq5pMIBq1s5hz3HQxhJJSu/SUGlD+SM=
10481048
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
1049-
golang.org/x/net v0.12.1-0.20230712162946-57553cbff163 h1:1EDKNuaCsog7zGLEml1qRuO4gt23jORUQX2f0IKZ860=
1049+
golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c h1:d+VvAxu4S13DWtf73R5eY//VaCk3aUcVdyYjM1SX7zw=
10501050
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
1051-
index b494e234d1fe1e..dc92957a4ff1a1 100644
1051+
index a158d645f30368..1dd4e398e9b2be 100644
10521052
--- a/src/go/build/deps_test.go
10531053
+++ b/src/go/build/deps_test.go
10541054
@@ -425,6 +425,10 @@ var depsRules = `

0 commit comments

Comments
 (0)