Skip to content

Commit 8398498

Browse files
gdamsgdams
committed
merge main
2 parents bce2e77 + bd145c4 commit 8398498

6 files changed

+142
-111
lines changed

‎eng/pipeline/stages/run-stage.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,16 @@ stages:
149149
150150
# Initialize stage 0 toolset ahead of time so we can track timing data separately from the
151151
# build operations. When we call this script again later, it won't download Go again.
152-
- pwsh: |
153-
. eng/utilities.ps1
154-
Download-Stage0
155-
env:
156-
${{ if eq(parameters.builder.os, 'darwin') }}:
157-
MS_USE_PATH_GO: '1'
158-
displayName: Init stage 0 Go toolset
152+
- ${{ if eq(parameters.builder.os, 'darwin') }}:
153+
- task: GoTool@0
154+
inputs:
155+
version: '1.23.3'
156+
displayName: Init upstream stage 0 Go toolset
157+
- ${{ else }}:
158+
- pwsh: |
159+
. eng/utilities.ps1
160+
Download-Stage0
161+
displayName: Init stage 0 Go toolset
159162
160163
- template: ../steps/init-submodule-task.yml
161164

‎patches/0002-Add-crypto-backend-foundation.patch

+32-28
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Subject: [PATCH] Add crypto backend foundation
3434
.../internal/backend/fips140/isrequirefips.go | 9 +
3535
.../internal/backend/fips140/norequirefips.go | 9 +
3636
.../backend/fips140/nosystemcrypto.go | 11 +
37-
src/crypto/internal/backend/nobackend.go | 229 ++++++++++++++++++
37+
src/crypto/internal/backend/nobackend.go | 233 ++++++++++++++++++
3838
src/crypto/internal/backend/stub.s | 10 +
3939
src/crypto/internal/cryptotest/allocations.go | 2 +-
4040
.../internal/cryptotest/implementations.go | 2 +-
@@ -68,15 +68,15 @@ Subject: [PATCH] Add crypto backend foundation
6868
src/crypto/tls/handshake_server.go | 10 +-
6969
src/crypto/tls/handshake_server_tls13.go | 25 +-
7070
src/crypto/tls/internal/fips140tls/fipstls.go | 3 +-
71-
src/crypto/tls/prf.go | 41 ++++
71+
src/crypto/tls/prf.go | 41 +++
7272
src/go/build/deps_test.go | 8 +-
7373
src/hash/boring_test.go | 9 +
7474
src/hash/example_test.go | 2 +
7575
src/hash/marshal_test.go | 9 +
7676
src/hash/notboring_test.go | 9 +
7777
src/net/smtp/smtp_test.go | 72 ++++--
7878
src/runtime/runtime_boring.go | 5 +
79-
72 files changed, 1217 insertions(+), 89 deletions(-)
79+
72 files changed, 1221 insertions(+), 89 deletions(-)
8080
create mode 100644 src/crypto/dsa/boring.go
8181
create mode 100644 src/crypto/dsa/notboring.go
8282
create mode 100644 src/crypto/ed25519/boring.go
@@ -556,10 +556,10 @@ index 275c60b4de49eb..ff8bddf28c4545 100644
556556
"math/big"
557557
)
558558
diff --git a/src/crypto/ecdsa/ecdsa.go b/src/crypto/ecdsa/ecdsa.go
559-
index 0f9749975ffba9..41ac17df22d7d7 100644
559+
index f682e6b1c6cfa6..049da55bd70f2c 100644
560560
--- a/src/crypto/ecdsa/ecdsa.go
561561
+++ b/src/crypto/ecdsa/ecdsa.go
562-
@@ -18,8 +18,8 @@ import (
562+
@@ -20,8 +20,8 @@ import (
563563
"crypto"
564564
"crypto/ecdh"
565565
"crypto/elliptic"
@@ -590,7 +590,7 @@ index 039bd82ed21f9f..69a97d9bf250be 100644
590590
panic("boringcrypto: not available")
591591
diff --git a/src/crypto/ed25519/boring.go b/src/crypto/ed25519/boring.go
592592
new file mode 100644
593-
index 00000000000000..ff5c426b4fdaea
593+
index 00000000000000..cce33e4d6cc927
594594
--- /dev/null
595595
+++ b/src/crypto/ed25519/boring.go
596596
@@ -0,0 +1,71 @@
@@ -633,7 +633,7 @@ index 00000000000000..ff5c426b4fdaea
633633
+
634634
+ b = new(boringPub)
635635
+ copy(b.orig[:], pub)
636-
+ key, err := boring.NewPublicKeyEd25119(b.orig[:])
636+
+ key, err := boring.NewPublicKeyEd25519(b.orig[:])
637637
+ if err != nil {
638638
+ return key, err
639639
+ }
@@ -657,7 +657,7 @@ index 00000000000000..ff5c426b4fdaea
657657
+
658658
+ b = new(boringPriv)
659659
+ copy(b.orig[:], priv)
660-
+ key, err := boring.NewPrivateKeyEd25119(b.orig[:])
660+
+ key, err := boring.NewPrivateKeyEd25519(b.orig[:])
661661
+ if err != nil {
662662
+ return key, err
663663
+ }
@@ -666,7 +666,7 @@ index 00000000000000..ff5c426b4fdaea
666666
+ return key, nil
667667
+}
668668
diff --git a/src/crypto/ed25519/ed25519.go b/src/crypto/ed25519/ed25519.go
669-
index c1f8ff784e4a5c..308d814ff6302b 100644
669+
index c1f8ff784e4a5c..6476bfbe896d6c 100644
670670
--- a/src/crypto/ed25519/ed25519.go
671671
+++ b/src/crypto/ed25519/ed25519.go
672672
@@ -17,6 +17,7 @@ package ed25519
@@ -767,7 +767,7 @@ index c1f8ff784e4a5c..308d814ff6302b 100644
767767
+ 0x22, 0xab, 0xbe, 0xe6, 0x85, 0xfd, 0xa4, 0x42, 0x0f, 0x88, 0x34,
768768
+ 0xb1, 0x08, 0xc3, 0xbd, 0xae, 0x36, 0x9e, 0xf5, 0x49, 0xfa,
769769
+ }
770-
+ pub, err := boring.NewPublicKeyEd25119(pkey)
770+
+ pub, err := boring.NewPublicKeyEd25519(pkey)
771771
+ if err != nil {
772772
+ return false
773773
+ }
@@ -1148,10 +1148,10 @@ index 00000000000000..83691d7dd42d51
11481148
+}
11491149
diff --git a/src/crypto/internal/backend/nobackend.go b/src/crypto/internal/backend/nobackend.go
11501150
new file mode 100644
1151-
index 00000000000000..06e19c55345187
1151+
index 00000000000000..3ebb6d5e4b4bb5
11521152
--- /dev/null
11531153
+++ b/src/crypto/internal/backend/nobackend.go
1154-
@@ -0,0 +1,229 @@
1154+
@@ -0,0 +1,233 @@
11551155
+// Copyright 2017 The Go Authors. All rights reserved.
11561156
+// Use of this source code is governed by a BSD-style
11571157
+// license that can be found in the LICENSE file.
@@ -1180,19 +1180,23 @@ index 00000000000000..06e19c55345187
11801180
+
11811181
+func SupportsHash(h crypto.Hash) bool { panic("cryptobackend: not available") }
11821182
+
1183-
+func NewMD5() hash.Hash { panic("cryptobackend: not available") }
1184-
+func NewSHA1() hash.Hash { panic("cryptobackend: not available") }
1185-
+func NewSHA224() hash.Hash { panic("cryptobackend: not available") }
1186-
+func NewSHA256() hash.Hash { panic("cryptobackend: not available") }
1187-
+func NewSHA384() hash.Hash { panic("cryptobackend: not available") }
1188-
+func NewSHA512() hash.Hash { panic("cryptobackend: not available") }
1189-
+
1190-
+func MD5(p []byte) (sum [16]byte) { panic("cryptobackend: not available") }
1191-
+func SHA1(p []byte) (sum [20]byte) { panic("cryptobackend: not available") }
1192-
+func SHA224(p []byte) (sum [28]byte) { panic("cryptobackend: not available") }
1193-
+func SHA256(p []byte) (sum [32]byte) { panic("cryptobackend: not available") }
1194-
+func SHA384(p []byte) (sum [48]byte) { panic("cryptobackend: not available") }
1195-
+func SHA512(p []byte) (sum [64]byte) { panic("cryptobackend: not available") }
1183+
+func NewMD5() hash.Hash { panic("cryptobackend: not available") }
1184+
+func NewSHA1() hash.Hash { panic("cryptobackend: not available") }
1185+
+func NewSHA224() hash.Hash { panic("cryptobackend: not available") }
1186+
+func NewSHA256() hash.Hash { panic("cryptobackend: not available") }
1187+
+func NewSHA384() hash.Hash { panic("cryptobackend: not available") }
1188+
+func NewSHA512() hash.Hash { panic("cryptobackend: not available") }
1189+
+func NewSHA512_224() hash.Hash { panic("cryptobackend: not available") }
1190+
+func NewSHA512_256() hash.Hash { panic("cryptobackend: not available") }
1191+
+
1192+
+func MD5(p []byte) (sum [16]byte) { panic("cryptobackend: not available") }
1193+
+func SHA1(p []byte) (sum [20]byte) { panic("cryptobackend: not available") }
1194+
+func SHA224(p []byte) (sum [28]byte) { panic("cryptobackend: not available") }
1195+
+func SHA256(p []byte) (sum [32]byte) { panic("cryptobackend: not available") }
1196+
+func SHA384(p []byte) (sum [48]byte) { panic("cryptobackend: not available") }
1197+
+func SHA512(p []byte) (sum [64]byte) { panic("cryptobackend: not available") }
1198+
+func SHA512_224(p []byte) (sum [28]byte) { panic("cryptobackend: not available") }
1199+
+func SHA512_256(p []byte) (sum [32]byte) { panic("cryptobackend: not available") }
11961200
+
11971201
+func NewHMAC(h func() hash.Hash, key []byte) hash.Hash { panic("cryptobackend: not available") }
11981202
+
@@ -1331,11 +1335,11 @@ index 00000000000000..06e19c55345187
13311335
+ panic("cryptobackend: not available")
13321336
+}
13331337
+
1334-
+func NewPrivateKeyEd25119(priv []byte) (PrivateKeyEd25519, error) {
1338+
+func NewPrivateKeyEd25519(priv []byte) (*PrivateKeyEd25519, error) {
13351339
+ panic("cryptobackend: not available")
13361340
+}
13371341
+
1338-
+func NewPublicKeyEd25119(pub []byte) (PublicKeyEd25519, error) {
1342+
+func NewPublicKeyEd25519(pub []byte) (*PublicKeyEd25519, error) {
13391343
+ panic("cryptobackend: not available")
13401344
+}
13411345
+
@@ -2430,7 +2434,7 @@ index e7369542a73270..ff52175e4ac636 100644
24302434
}
24312435
}
24322436
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
2433-
index d9d985dca4ade4..de88160bcf3a1c 100644
2437+
index a62a5173b9c6bc..b39db00839ab43 100644
24342438
--- a/src/go/build/deps_test.go
24352439
+++ b/src/go/build/deps_test.go
24362440
@@ -493,6 +493,8 @@ var depsRules = `

‎patches/0003-Add-BoringSSL-crypto-backend.patch

+23-19
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Subject: [PATCH] Add BoringSSL crypto backend
55

66
---
77
.../internal/backend/bbig/big_boring.go | 12 +
8-
src/crypto/internal/backend/boring_linux.go | 263 ++++++++++++++++++
8+
src/crypto/internal/backend/boring_linux.go | 267 ++++++++++++++++++
99
src/crypto/internal/backend/fips140/boring.go | 11 +
10-
3 files changed, 286 insertions(+)
10+
3 files changed, 290 insertions(+)
1111
create mode 100644 src/crypto/internal/backend/bbig/big_boring.go
1212
create mode 100644 src/crypto/internal/backend/boring_linux.go
1313
create mode 100644 src/crypto/internal/backend/fips140/boring.go
@@ -32,10 +32,10 @@ index 00000000000000..0b62cef68546d0
3232
+var Dec = bbig.Dec
3333
diff --git a/src/crypto/internal/backend/boring_linux.go b/src/crypto/internal/backend/boring_linux.go
3434
new file mode 100644
35-
index 00000000000000..b1bd6d5ba756d7
35+
index 00000000000000..94bc444f10eb2b
3636
--- /dev/null
3737
+++ b/src/crypto/internal/backend/boring_linux.go
38-
@@ -0,0 +1,263 @@
38+
@@ -0,0 +1,267 @@
3939
+// Copyright 2017 The Go Authors. All rights reserved.
4040
+// Use of this source code is governed by a BSD-style
4141
+// license that can be found in the LICENSE file.
@@ -69,19 +69,23 @@ index 00000000000000..b1bd6d5ba756d7
6969
+ }
7070
+}
7171
+
72-
+func NewMD5() hash.Hash { panic("cryptobackend: not available") }
73-
+func NewSHA1() hash.Hash { return boring.NewSHA1() }
74-
+func NewSHA224() hash.Hash { return boring.NewSHA224() }
75-
+func NewSHA256() hash.Hash { return boring.NewSHA256() }
76-
+func NewSHA384() hash.Hash { return boring.NewSHA384() }
77-
+func NewSHA512() hash.Hash { return boring.NewSHA512() }
78-
+
79-
+func MD5(p []byte) (sum [16]byte) { panic("cryptobackend: not available") }
80-
+func SHA1(p []byte) (sum [20]byte) { return boring.SHA1(p) }
81-
+func SHA224(p []byte) (sum [28]byte) { return boring.SHA224(p) }
82-
+func SHA256(p []byte) (sum [32]byte) { return boring.SHA256(p) }
83-
+func SHA384(p []byte) (sum [48]byte) { return boring.SHA384(p) }
84-
+func SHA512(p []byte) (sum [64]byte) { return boring.SHA512(p) }
72+
+func NewMD5() hash.Hash { panic("cryptobackend: not available") }
73+
+func NewSHA1() hash.Hash { return boring.NewSHA1() }
74+
+func NewSHA224() hash.Hash { return boring.NewSHA224() }
75+
+func NewSHA256() hash.Hash { return boring.NewSHA256() }
76+
+func NewSHA384() hash.Hash { return boring.NewSHA384() }
77+
+func NewSHA512() hash.Hash { return boring.NewSHA512() }
78+
+func NewSHA512_224() hash.Hash { panic("cryptobackend: not available") }
79+
+func NewSHA512_256() hash.Hash { panic("cryptobackend: not available") }
80+
+
81+
+func MD5(p []byte) (sum [16]byte) { panic("cryptobackend: not available") }
82+
+func SHA1(p []byte) (sum [20]byte) { return boring.SHA1(p) }
83+
+func SHA224(p []byte) (sum [28]byte) { return boring.SHA224(p) }
84+
+func SHA256(p []byte) (sum [32]byte) { return boring.SHA256(p) }
85+
+func SHA384(p []byte) (sum [48]byte) { return boring.SHA384(p) }
86+
+func SHA512(p []byte) (sum [64]byte) { return boring.SHA512(p) }
87+
+func SHA512_224(p []byte) (sum [28]byte) { panic("cryptobackend: not available") }
88+
+func SHA512_256(p []byte) (sum [32]byte) { panic("cryptobackend: not available") }
8589
+
8690
+func NewHMAC(h func() hash.Hash, key []byte) hash.Hash { return boring.NewHMAC(h, key) }
8791
+
@@ -249,11 +253,11 @@ index 00000000000000..b1bd6d5ba756d7
249253
+ panic("cryptobackend: not available")
250254
+}
251255
+
252-
+func NewPrivateKeyEd25119(priv []byte) (PrivateKeyEd25519, error) {
256+
+func NewPrivateKeyEd25519(priv []byte) (PrivateKeyEd25519, error) {
253257
+ panic("cryptobackend: not available")
254258
+}
255259
+
256-
+func NewPublicKeyEd25119(pub []byte) (PublicKeyEd25519, error) {
260+
+func NewPublicKeyEd25519(pub []byte) (PublicKeyEd25519, error) {
257261
+ panic("cryptobackend: not available")
258262
+}
259263
+

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

+37-23
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Subject: [PATCH] Add OpenSSL crypto backend
99
src/cmd/link/internal/ld/lib.go | 1 +
1010
.../internal/backend/bbig/big_openssl.go | 12 +
1111
.../internal/backend/fips140/openssl.go | 41 +++
12-
src/crypto/internal/backend/openssl_linux.go | 331 ++++++++++++++++++
12+
src/crypto/internal/backend/openssl_linux.go | 345 ++++++++++++++++++
1313
src/crypto/rsa/rsa_test.go | 3 +
1414
src/go.mod | 1 +
1515
src/go.sum | 2 +
@@ -19,15 +19,15 @@ Subject: [PATCH] Add OpenSSL crypto backend
1919
.../goexperiment/exp_opensslcrypto_on.go | 9 +
2020
src/internal/goexperiment/flags.go | 1 +
2121
src/os/exec/exec_test.go | 9 +
22-
15 files changed, 436 insertions(+), 5 deletions(-)
22+
15 files changed, 450 insertions(+), 5 deletions(-)
2323
create mode 100644 src/crypto/internal/backend/bbig/big_openssl.go
2424
create mode 100644 src/crypto/internal/backend/fips140/openssl.go
2525
create mode 100644 src/crypto/internal/backend/openssl_linux.go
2626
create mode 100644 src/internal/goexperiment/exp_opensslcrypto_off.go
2727
create mode 100644 src/internal/goexperiment/exp_opensslcrypto_on.go
2828

2929
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
30-
index 06bd01bc5bb995..9561bf2bca9a9d 100644
30+
index 0c992118f4287b..0de6e80fd985a3 100644
3131
--- a/src/cmd/dist/test.go
3232
+++ b/src/cmd/dist/test.go
3333
@@ -1324,12 +1324,11 @@ func (t *tester) registerCgoTests(heading string) {
@@ -142,10 +142,10 @@ index 00000000000000..118efa3a492a7d
142142
+}
143143
diff --git a/src/crypto/internal/backend/openssl_linux.go b/src/crypto/internal/backend/openssl_linux.go
144144
new file mode 100644
145-
index 00000000000000..d3a663737a1ce3
145+
index 00000000000000..44d91d5b7ba3d5
146146
--- /dev/null
147147
+++ b/src/crypto/internal/backend/openssl_linux.go
148-
@@ -0,0 +1,331 @@
148+
@@ -0,0 +1,345 @@
149149
+// Copyright 2017 The Go Authors. All rights reserved.
150150
+// Use of this source code is governed by a BSD-style
151151
+// license that can be found in the LICENSE file.
@@ -233,19 +233,23 @@ index 00000000000000..d3a663737a1ce3
233233
+ return openssl.SupportsHash(h)
234234
+}
235235
+
236-
+func NewMD5() hash.Hash { return openssl.NewMD5() }
237-
+func NewSHA1() hash.Hash { return openssl.NewSHA1() }
238-
+func NewSHA224() hash.Hash { return openssl.NewSHA224() }
239-
+func NewSHA256() hash.Hash { return openssl.NewSHA256() }
240-
+func NewSHA384() hash.Hash { return openssl.NewSHA384() }
241-
+func NewSHA512() hash.Hash { return openssl.NewSHA512() }
242-
+
243-
+func MD5(p []byte) (sum [16]byte) { return openssl.MD5(p) }
244-
+func SHA1(p []byte) (sum [20]byte) { return openssl.SHA1(p) }
245-
+func SHA224(p []byte) (sum [28]byte) { return openssl.SHA224(p) }
246-
+func SHA256(p []byte) (sum [32]byte) { return openssl.SHA256(p) }
247-
+func SHA384(p []byte) (sum [48]byte) { return openssl.SHA384(p) }
248-
+func SHA512(p []byte) (sum [64]byte) { return openssl.SHA512(p) }
236+
+func NewMD5() hash.Hash { return openssl.NewMD5() }
237+
+func NewSHA1() hash.Hash { return openssl.NewSHA1() }
238+
+func NewSHA224() hash.Hash { return openssl.NewSHA224() }
239+
+func NewSHA256() hash.Hash { return openssl.NewSHA256() }
240+
+func NewSHA384() hash.Hash { return openssl.NewSHA384() }
241+
+func NewSHA512() hash.Hash { return openssl.NewSHA512() }
242+
+func NewSHA512_224() hash.Hash { return openssl.NewSHA512_224() }
243+
+func NewSHA512_256() hash.Hash { return openssl.NewSHA512_256() }
244+
+
245+
+func MD5(p []byte) (sum [16]byte) { return openssl.MD5(p) }
246+
+func SHA1(p []byte) (sum [20]byte) { return openssl.SHA1(p) }
247+
+func SHA224(p []byte) (sum [28]byte) { return openssl.SHA224(p) }
248+
+func SHA256(p []byte) (sum [32]byte) { return openssl.SHA256(p) }
249+
+func SHA384(p []byte) (sum [48]byte) { return openssl.SHA384(p) }
250+
+func SHA512(p []byte) (sum [64]byte) { return openssl.SHA512(p) }
251+
+func SHA512_224(p []byte) (sum [28]byte) { return openssl.SHA512_224(p) }
252+
+func SHA512_256(p []byte) (sum [32]byte) { return openssl.SHA512_256(p) }
249253
+
250254
+func NewHMAC(h func() hash.Hash, key []byte) hash.Hash { return openssl.NewHMAC(h, key) }
251255
+
@@ -411,12 +415,22 @@ index 00000000000000..d3a663737a1ce3
411415
+ return openssl.GenerateKeyEd25519()
412416
+}
413417
+
418+
+// Deprecated: use NewPrivateKeyEd25519 instead.
414419
+func NewPrivateKeyEd25119(priv []byte) (PrivateKeyEd25519, error) {
415-
+ return openssl.NewPrivateKeyEd25119(priv)
420+
+ return openssl.NewPrivateKeyEd25519(priv)
416421
+}
417422
+
423+
+// Deprecated: use NewPublicKeyEd25519 instead.
418424
+func NewPublicKeyEd25119(pub []byte) (PublicKeyEd25519, error) {
419-
+ return openssl.NewPublicKeyEd25119(pub)
425+
+ return openssl.NewPublicKeyEd25519(pub)
426+
+}
427+
+
428+
+func NewPrivateKeyEd25519(priv []byte) (PrivateKeyEd25519, error) {
429+
+ return openssl.NewPrivateKeyEd25519(priv)
430+
+}
431+
+
432+
+func NewPublicKeyEd25519(pub []byte) (PublicKeyEd25519, error) {
433+
+ return openssl.NewPublicKeyEd25519(pub)
420434
+}
421435
+
422436
+func NewPrivateKeyEd25519FromSeed(seed []byte) (PrivateKeyEd25519, error) {
@@ -492,7 +506,7 @@ index f9543d9cc89e7b..f07c75821aab13 100644
492506

493507
msg := []byte{0xed, 0x36, 0x90, 0x8d, 0xbe, 0xfc, 0x35, 0x40, 0x70, 0x4f, 0xf5, 0x9d, 0x6e, 0xc2, 0xeb, 0xf5, 0x27, 0xae, 0x65, 0xb0, 0x59, 0x29, 0x45, 0x25, 0x8c, 0xc1, 0x91, 0x22}
494508
diff --git a/src/go.mod b/src/go.mod
495-
index 7a1318dcac32ba..186ced4a1123a8 100644
509+
index 7a1318dcac32ba..f12d9b4d9172ab 100644
496510
--- a/src/go.mod
497511
+++ b/src/go.mod
498512
@@ -3,6 +3,7 @@ module std
@@ -504,7 +518,7 @@ index 7a1318dcac32ba..186ced4a1123a8 100644
504518
golang.org/x/net v0.32.1-0.20241206180132-552d8ac903a1
505519
)
506520
diff --git a/src/go.sum b/src/go.sum
507-
index 9e661352f16e0b..0a58eccb57a869 100644
521+
index 9e661352f16e0b..e51f0f57540a83 100644
508522
--- a/src/go.sum
509523
+++ b/src/go.sum
510524
@@ -1,3 +1,5 @@
@@ -514,7 +528,7 @@ index 9e661352f16e0b..0a58eccb57a869 100644
514528
golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
515529
golang.org/x/net v0.32.1-0.20241206180132-552d8ac903a1 h1:+Yk1FZ5E+/ewA0nOO/HRYs9E4yeqpGOShuSAdzCNNoQ=
516530
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
517-
index de88160bcf3a1c..339cb53d8a1468 100644
531+
index b39db00839ab43..392f8d8c52c4b6 100644
518532
--- a/src/go/build/deps_test.go
519533
+++ b/src/go/build/deps_test.go
520534
@@ -509,12 +509,14 @@ var depsRules = `

0 commit comments

Comments
 (0)