Skip to content

Commit f06b6b2

Browse files
gdamsCopilot
andcommitted
Use merged OpenSSL main fix and tidy backend module
Pin the merged c9be04267896 commit instead of the PR branch commit. Run go generate in cryptobackend to remove stale checksums and fix TestXCryptoDependencyIsSynced, then regenerate the vendor patch and index. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 8253fc9 commit f06b6b2

4 files changed

Lines changed: 439 additions & 439 deletions

File tree

‎cryptobackend/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.26.0
44

55
require (
66
github.com/microsoft/go-crypto-darwin v0.0.3-0.20261026090017-171c4346c8c7
7-
github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028125254-28e7a1eb608a
7+
github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028130524-c9be04267896
88
github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832
99
golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2
1010
)

‎cryptobackend/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
github.com/microsoft/go-crypto-darwin v0.0.3-0.20261026090017-171c4346c8c7 h1:KqCuZFj0Vtzr+BYP7g4CiIuyoaOdIs+qRrLQiznTIJ4=
22
github.com/microsoft/go-crypto-darwin v0.0.3-0.20261026090017-171c4346c8c7/go.mod h1:Qk7P66UNeurLdefRFjOLOra7dGK2KDwI7zV19wUqNSc=
3-
github.com/microsoft/go-crypto-openssl v0.5.1-0.20261026090129-f83222ce3a39 h1:v1QjQa/33Fr93q2QZv6SpiPVz66b1Na+XiihtgV+DJ4=
4-
github.com/microsoft/go-crypto-openssl v0.5.1-0.20261026090129-f83222ce3a39/go.mod h1:rdSY8BhWs3fySEKPnwYbTbCAWxnXQAfrE8qBibXNU/M=
5-
github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028125254-28e7a1eb608a h1:fJCtVIb8oAV7g14Tlwv1fDcH/8tWSQcqrkqeO7aAzIU=
6-
github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028125254-28e7a1eb608a/go.mod h1:rdSY8BhWs3fySEKPnwYbTbCAWxnXQAfrE8qBibXNU/M=
3+
github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028130524-c9be04267896 h1:1lSixLTjxTJrebi1GwaQFEJSBp1HkRXTbmUz9MZc1DU=
4+
github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028130524-c9be04267896/go.mod h1:rdSY8BhWs3fySEKPnwYbTbCAWxnXQAfrE8qBibXNU/M=
75
github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832 h1:j9iNaPbnm5YcNqOxBbOFzvRhzKdnYRTVsTGUjAcZhxk=
86
github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832/go.mod h1:ic6qQ5ko8bzigvuQbGMknZ4WzS4/KDQ9cypGMdqn38s=
97
golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2 h1:S2kz2UVkb4BhxS9tvxdkfNT6T8NqtaUQE+qv1ObhJ8w=

‎patches/0001-Vendor-external-dependencies.patch‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result
3535
src/cmd/vendor/modules.txt | 11 +
3636
src/crypto/deps_ignore.go | 40 +
3737
src/go.mod | 6 +
38-
src/go.sum | 8 +
38+
src/go.sum | 10 +
3939
src/go/build/deps_test.go | 55 +-
4040
src/go/build/vendor_test.go | 5 +
4141
.../microsoft/go-crypto-darwin/LICENSE | 21 +
@@ -459,7 +459,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result
459459
.../go/cryptobackend/tls13/tls13_openssl.go | 18 +
460460
.../go/cryptobackend/tls13/tls13_windows.go | 14 +
461461
src/vendor/modules.txt | 54 +
462-
451 files changed, 44389 insertions(+), 7 deletions(-)
462+
451 files changed, 44391 insertions(+), 7 deletions(-)
463463
create mode 100644 src/cmd/internal/telemetry/counter/deps_ignore.go
464464
create mode 100644 src/cmd/vendor/github.com/microsoft/go-infra/telemetry/LICENSE
465465
create mode 100644 src/cmd/vendor/github.com/microsoft/go-infra/telemetry/README.md
@@ -2818,7 +2818,7 @@ index 0000000000000000000000000000000000000000..ab958419731f59c42d1ae2210dd94b06
28182818
+// This file is here just to declare cryptobackend dependencies.
28192819
+// This allows tracking their versions in a single patch file.
28202820
diff --git a/src/go.mod b/src/go.mod
2821-
index 12b6b39c9e4cf8c4315083c57d41d759c2878eee..ac0bc14008b03b12a34ec7f70dd4c55e29dff5bd 100644
2821+
index 12b6b39c9e4cf8c4315083c57d41d759c2878eee..f10199a8f1f2597674c1df039fe0db768bee8bb4 100644
28222822
--- a/src/go.mod
28232823
+++ b/src/go.mod
28242824
@@ -3,12 +3,18 @@ module std
@@ -2833,24 +2833,26 @@ index 12b6b39c9e4cf8c4315083c57d41d759c2878eee..ac0bc14008b03b12a34ec7f70dd4c55e
28332833

28342834
require (
28352835
+ github.com/microsoft/go-crypto-darwin v0.0.3-0.20261026090017-171c4346c8c7 // indirect
2836-
+ github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028125254-28e7a1eb608a // indirect
2836+
+ github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028130524-c9be04267896 // indirect
28372837
+ github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832 // indirect
28382838
golang.org/x/sys v0.48.0 // indirect
28392839
golang.org/x/text v0.42.0 // indirect
28402840
)
28412841
+
28422842
+replace github.com/microsoft/go/cryptobackend => ../../cryptobackend
28432843
diff --git a/src/go.sum b/src/go.sum
2844-
index 4d2c4120ca2482bc9543576c7e585fa933c17a96..0b3808679b7077b833a98358e602fc80c843ebe4 100644
2844+
index 4d2c4120ca2482bc9543576c7e585fa933c17a96..4560de0dbaa7a823d9b3d2d2b142c7062a44e007 100644
28452845
--- a/src/go.sum
28462846
+++ b/src/go.sum
2847-
@@ -1,3 +1,11 @@
2847+
@@ -1,3 +1,13 @@
28482848
+github.com/microsoft/go-crypto-darwin v0.0.3-0.20261026090017-171c4346c8c7 h1:KqCuZFj0Vtzr+BYP7g4CiIuyoaOdIs+qRrLQiznTIJ4=
28492849
+github.com/microsoft/go-crypto-darwin v0.0.3-0.20261026090017-171c4346c8c7/go.mod h1:Qk7P66UNeurLdefRFjOLOra7dGK2KDwI7zV19wUqNSc=
28502850
+github.com/microsoft/go-crypto-openssl v0.5.1-0.20261026090129-f83222ce3a39 h1:v1QjQa/33Fr93q2QZv6SpiPVz66b1Na+XiihtgV+DJ4=
28512851
+github.com/microsoft/go-crypto-openssl v0.5.1-0.20261026090129-f83222ce3a39/go.mod h1:rdSY8BhWs3fySEKPnwYbTbCAWxnXQAfrE8qBibXNU/M=
28522852
+github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028125254-28e7a1eb608a h1:fJCtVIb8oAV7g14Tlwv1fDcH/8tWSQcqrkqeO7aAzIU=
28532853
+github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028125254-28e7a1eb608a/go.mod h1:rdSY8BhWs3fySEKPnwYbTbCAWxnXQAfrE8qBibXNU/M=
2854+
+github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028130524-c9be04267896 h1:1lSixLTjxTJrebi1GwaQFEJSBp1HkRXTbmUz9MZc1DU=
2855+
+github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028130524-c9be04267896/go.mod h1:rdSY8BhWs3fySEKPnwYbTbCAWxnXQAfrE8qBibXNU/M=
28542856
+github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832 h1:j9iNaPbnm5YcNqOxBbOFzvRhzKdnYRTVsTGUjAcZhxk=
28552857
+github.com/microsoft/go-crypto-winnative v0.0.0-20261026140708-37ac3f543832/go.mod h1:ic6qQ5ko8bzigvuQbGMknZ4WzS4/KDQ9cypGMdqn38s=
28562858
golang.org/x/crypto v0.57.1-0.20260921070245-7a4a4d6beae2 h1:S2kz2UVkb4BhxS9tvxdkfNT6T8NqtaUQE+qv1ObhJ8w=
@@ -50306,7 +50308,7 @@ index 0000000000000000000000000000000000000000..b7ffeea07c6b8d69acc43cc3bce25433
5030650308
+ panic("cryptobackend: not available")
5030750309
+}
5030850310
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
50309-
index 26fd3c0df44eb0644f4aaf3d74920dc9ea968389..36747b186905934fc0c06a6240ee4e98e1c54bfe 100644
50311+
index 26fd3c0df44eb0644f4aaf3d74920dc9ea968389..71fd5d779c3c55043c918d42462286c5f0b1ba50 100644
5031050312
--- a/src/vendor/modules.txt
5031150313
+++ b/src/vendor/modules.txt
5031250314
@@ -1,3 +1,56 @@
@@ -50318,7 +50320,7 @@ index 26fd3c0df44eb0644f4aaf3d74920dc9ea968389..36747b186905934fc0c06a6240ee4e98
5031850320
+github.com/microsoft/go-crypto-darwin/internal/security
5031950321
+github.com/microsoft/go-crypto-darwin/internal/xsyscall
5032050322
+github.com/microsoft/go-crypto-darwin/xcrypto
50321-
+# github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028125254-28e7a1eb608a
50323+
+# github.com/microsoft/go-crypto-openssl v0.5.1-0.20261028130524-c9be04267896
5032250324
+## explicit; go 1.26
5032350325
+github.com/microsoft/go-crypto-openssl/bbig
5032450326
+github.com/microsoft/go-crypto-openssl/internal/fakecgo

0 commit comments

Comments
 (0)