Skip to content

Commit 37d1cbe

Browse files
Merge pull request #1895 from microsoft/dev/auto-sync/microsoft/release-branch.go1.24
Update submodule to latest `release-branch.go1.24` in `microsoft/release-branch.go1.24`
2 parents a40cddb + 4877529 commit 37d1cbe

File tree

6 files changed

+57
-21
lines changed

6 files changed

+57
-21
lines changed

MICROSOFT_REVISION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1

VERSION

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

go

Submodule go updated 60 files

patches/0002-Vendor-crypto-backends.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,10 @@ index 7301ae09c45516..928a77bb8c3547 100644
254254
golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
255255
golang.org/x/net v0.32.1-0.20250304185419-76f9bf3279ef h1:oQtTn7aH5kyi7dPmG2Eot3aG1XBwnkrX+zIq+lNeZeM=
256256
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
257-
index e3e01077c18b17..72e56b5da8e582 100644
257+
index 48d8e4be177362..f7848010e97e3c 100644
258258
--- a/src/go/build/deps_test.go
259259
+++ b/src/go/build/deps_test.go
260-
@@ -493,6 +493,24 @@ var depsRules = `
260+
@@ -495,6 +495,24 @@ var depsRules = `
261261
< crypto/internal/fips140/rsa
262262
< FIPS;
263263

@@ -282,7 +282,7 @@ index e3e01077c18b17..72e56b5da8e582 100644
282282
FIPS, internal/godebug < crypto/fips140;
283283

284284
crypto, hash !< FIPS;
285-
@@ -506,13 +524,12 @@ var depsRules = `
285+
@@ -508,13 +526,12 @@ var depsRules = `
286286
FIPS, internal/godebug, hash, embed,
287287
crypto/internal/boring/sig,
288288
crypto/internal/boring/syso,
@@ -300,18 +300,18 @@ index e3e01077c18b17..72e56b5da8e582 100644
300300
< crypto/internal/boring
301301
< crypto/boring
302302
< crypto/aes,
303-
@@ -533,6 +550,10 @@ var depsRules = `
303+
@@ -535,6 +552,10 @@ var depsRules = `
304304

305305
# CRYPTO-MATH is crypto that exposes math/big APIs - no cgo, net; fmt now ok.
306306

307307
+ math/big, github.com/golang-fips/openssl/v2 < github.com/golang-fips/openssl/v2/bbig;
308308
+ math/big, github.com/microsoft/go-crypto-darwin/xcrypto < github.com/microsoft/go-crypto-darwin/bbig;
309309
+ math/big, github.com/microsoft/go-crypto-winnative/cng < github.com/microsoft/go-crypto-winnative/cng/bbig;
310310
+
311-
CRYPTO, FMT, math/big
311+
CRYPTO, FMT, math/big, internal/saferio
312312
< crypto/internal/boring/bbig
313313
< crypto/rand
314-
@@ -837,7 +858,7 @@ var buildIgnore = []byte("\n//go:build ignore")
314+
@@ -839,7 +860,7 @@ var buildIgnore = []byte("\n//go:build ignore")
315315

316316
func findImports(pkg string) ([]string, error) {
317317
vpkg := pkg
@@ -320,7 +320,7 @@ index e3e01077c18b17..72e56b5da8e582 100644
320320
vpkg = "vendor/" + pkg
321321
}
322322
dir := filepath.Join(Default.GOROOT, "src", vpkg)
323-
@@ -847,7 +868,7 @@ func findImports(pkg string) ([]string, error) {
323+
@@ -849,7 +870,7 @@ func findImports(pkg string) ([]string, error) {
324324
}
325325
var imports []string
326326
var haveImport = map[string]bool{}

patches/0003-Implement-crypto-internal-backend.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,10 +2744,10 @@ index 00000000000000..032d6df3405a1b
27442744
+
27452745
+const TLS13KDFEnabled = true
27462746
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
2747-
index 72e56b5da8e582..45ceb3e2b4ce11 100644
2747+
index f7848010e97e3c..b6e5cdad794673 100644
27482748
--- a/src/go/build/deps_test.go
27492749
+++ b/src/go/build/deps_test.go
2750-
@@ -511,6 +511,11 @@ var depsRules = `
2750+
@@ -513,6 +513,11 @@ var depsRules = `
27512751
< github.com/microsoft/go-crypto-winnative/internal/bcrypt
27522752
< github.com/microsoft/go-crypto-winnative/cng;
27532753

@@ -2759,7 +2759,7 @@ index 72e56b5da8e582..45ceb3e2b4ce11 100644
27592759
FIPS, internal/godebug < crypto/fips140;
27602760

27612761
crypto, hash !< FIPS;
2762-
@@ -521,16 +526,28 @@ var depsRules = `
2762+
@@ -523,16 +528,28 @@ var depsRules = `
27632763
NONE < crypto/internal/boring/sig, crypto/internal/boring/syso;
27642764
sync/atomic < crypto/internal/boring/bcache;
27652765

@@ -2790,12 +2790,12 @@ index 72e56b5da8e582..45ceb3e2b4ce11 100644
27902790
< crypto/boring
27912791
< crypto/aes,
27922792
crypto/des,
2793-
@@ -554,8 +571,12 @@ var depsRules = `
2793+
@@ -556,8 +573,12 @@ var depsRules = `
27942794
math/big, github.com/microsoft/go-crypto-darwin/xcrypto < github.com/microsoft/go-crypto-darwin/bbig;
27952795
math/big, github.com/microsoft/go-crypto-winnative/cng < github.com/microsoft/go-crypto-winnative/cng/bbig;
27962796

2797-
- CRYPTO, FMT, math/big
2798-
+ CRYPTO, FMT, math/big,
2797+
- CRYPTO, FMT, math/big, internal/saferio
2798+
+ CRYPTO, FMT, math/big, internal/saferio,
27992799
+ github.com/golang-fips/openssl/v2/bbig,
28002800
+ github.com/microsoft/go-crypto-darwin/bbig,
28012801
+ github.com/microsoft/go-crypto-winnative/cng/bbig

patches/0004-Use-crypto-backends.patch

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Subject: [PATCH] Use crypto backends
4040
src/crypto/hmac/hmac_test.go | 2 +-
4141
src/crypto/internal/cryptotest/allocations.go | 2 +-
4242
.../internal/cryptotest/implementations.go | 2 +-
43+
src/crypto/internal/fips140test/cast_test.go | 2 +
4344
src/crypto/internal/fips140test/check_test.go | 8 +-
4445
src/crypto/md5/md5.go | 10 +
4546
src/crypto/md5/md5_test.go | 16 ++
@@ -76,6 +77,7 @@ Subject: [PATCH] Use crypto backends
7677
src/crypto/tls/internal/tls13/tls13.go | 195 ++++++++++++++++++
7778
src/crypto/tls/key_schedule.go | 2 +-
7879
src/crypto/tls/prf.go | 41 ++++
80+
src/crypto/x509/verify_test.go | 2 +-
7981
src/go/build/deps_test.go | 5 +-
8082
src/hash/boring_test.go | 9 +
8183
src/hash/example_test.go | 2 +
@@ -85,7 +87,7 @@ Subject: [PATCH] Use crypto backends
8587
src/net/smtp/smtp_test.go | 72 ++++---
8688
src/os/exec/exec_test.go | 9 +
8789
src/runtime/pprof/vminfo_darwin_test.go | 6 +
88-
81 files changed, 1151 insertions(+), 112 deletions(-)
90+
83 files changed, 1154 insertions(+), 113 deletions(-)
8991
create mode 100644 src/crypto/dsa/boring.go
9092
create mode 100644 src/crypto/dsa/notboring.go
9193
create mode 100644 src/crypto/ecdsa/badlinkname.go
@@ -1210,6 +1212,26 @@ index 3fa730459050f6..1f28f12a6e7b4f 100644
12101212
"crypto/internal/impl"
12111213
"internal/goos"
12121214
"internal/testenv"
1215+
diff --git a/src/crypto/internal/fips140test/cast_test.go b/src/crypto/internal/fips140test/cast_test.go
1216+
index 4294ff2cbfdac1..e33cf3346129f4 100644
1217+
--- a/src/crypto/internal/fips140test/cast_test.go
1218+
+++ b/src/crypto/internal/fips140test/cast_test.go
1219+
@@ -133,6 +133,7 @@ func TestConditionals(t *testing.T) {
1220+
}
1221+
1222+
func TestCASTPasses(t *testing.T) {
1223+
+ t.Skip("Skipping because Microsoft build of Go doesn't support CAST.")
1224+
testenv.MustHaveExec(t)
1225+
if err := fips140.Supported(); err != nil {
1226+
t.Skipf("FIPS140 not supported: %v", err)
1227+
@@ -158,6 +159,7 @@ func TestCASTPasses(t *testing.T) {
1228+
}
1229+
1230+
func TestCASTFailures(t *testing.T) {
1231+
+ t.Skip("Skipping because Microsoft build of Go doesn't support CAST.")
1232+
testenv.MustHaveExec(t)
1233+
if err := fips140.Supported(); err != nil {
1234+
t.Skipf("FIPS140 not supported: %v", err)
12131235
diff --git a/src/crypto/internal/fips140test/check_test.go b/src/crypto/internal/fips140test/check_test.go
12141236
index e635a248096783..7ff73423d353b6 100644
12151237
--- a/src/crypto/internal/fips140test/check_test.go
@@ -2198,7 +2220,7 @@ index c0396e75796add..2c00e119cb66e4 100644
21982220
confTranscript.Sum(nil),
21992221
8,
22002222
diff --git a/src/crypto/tls/handshake_server.go b/src/crypto/tls/handshake_server.go
2201-
index 7c75977ad3ffb2..b9db95ca7b9d5a 100644
2223+
index 6aebb742229a50..d859e1294c3143 100644
22022224
--- a/src/crypto/tls/handshake_server.go
22032225
+++ b/src/crypto/tls/handshake_server.go
22042226
@@ -64,7 +64,15 @@ func (c *Conn) serverHandshake(ctx context.Context) error {
@@ -2619,11 +2641,24 @@ index e7369542a73270..ff52175e4ac636 100644
26192641
return tls12.PRF(hashFunc, secret, label, seed, keyLen)
26202642
}
26212643
}
2644+
diff --git a/src/crypto/x509/verify_test.go b/src/crypto/x509/verify_test.go
2645+
index 5595f99ea5e43a..e1a87fa839033a 100644
2646+
--- a/src/crypto/x509/verify_test.go
2647+
+++ b/src/crypto/x509/verify_test.go
2648+
@@ -3119,7 +3119,7 @@ func dsaSelfSignedCNX(t *testing.T) []byte {
2649+
t.Helper()
2650+
var params dsa.Parameters
2651+
if err := dsa.GenerateParameters(&params, rand.Reader, dsa.L1024N160); err != nil {
2652+
- t.Fatal(err)
2653+
+ t.Skip(err) // CBL-Mariner doesn't support dsa.L1024N160, skip test
2654+
}
2655+
2656+
var dsaPriv dsa.PrivateKey
26222657
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
2623-
index 45ceb3e2b4ce11..44f2dca0e85859 100644
2658+
index b6e5cdad794673..9adb3fa9f84467 100644
26242659
--- a/src/go/build/deps_test.go
26252660
+++ b/src/go/build/deps_test.go
2626-
@@ -516,7 +516,7 @@ var depsRules = `
2661+
@@ -518,7 +518,7 @@ var depsRules = `
26272662
< crypto/internal/backend/internal/opensslsetup
26282663
< crypto/internal/backend/fips140;
26292664

@@ -2632,15 +2667,15 @@ index 45ceb3e2b4ce11..44f2dca0e85859 100644
26322667

26332668
crypto, hash !< FIPS;
26342669

2635-
@@ -561,6 +561,7 @@ var depsRules = `
2670+
@@ -563,6 +563,7 @@ var depsRules = `
26362671
crypto/pbkdf2,
26372672
crypto/ecdh,
26382673
crypto/mlkem
26392674
+ < crypto/tls/internal/tls13
26402675
< CRYPTO;
26412676

26422677
CGO, fmt, net !< CRYPTO;
2643-
@@ -590,7 +591,7 @@ var depsRules = `
2678+
@@ -592,7 +593,7 @@ var depsRules = `
26442679

26452680
# TLS, Prince of Dependencies.
26462681

0 commit comments

Comments
 (0)