Skip to content

Commit 043e4ab

Browse files
authored
Rebase to latest upstream SHA (#328)
1 parent b5f72d9 commit 043e4ab

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

config/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"github.com/golang-fips/go": "main",
33
"github.com/golang-fips/openssl": "61a53ab338d5f1657c6fe5d856d24528bfdd731d",
4-
"github.com/golang/go": "047c2ab841e2d2233d0bef420d1b5ecb545a380a"
4+
"github.com/golang/go": "f6b9d56affb75103507f2b6ed4ffa98ca899b39d"
55
}

patches/000-fips.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5238,7 +5238,7 @@ index 410eb8648a..3521b49a3e 100644
52385238
+github.com/golang-fips/openssl/v2 v2.0.4-0.20240925082504-4fb8ffc9b3b8/go.mod h1:OYUBsoxLpFu8OFyhZHxfpN8lgcsw8JhTC3BQK7+XUc0=
52395239
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
52405240
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
5241-
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
5241+
golang.org/x/net v0.44.1-0.20251002015445-edb764c2296f h1:vNklv+oJQSYNGsWXHoCPi2MHMcpj9/Q7aBhvvfnJvGg=
52425242
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
52435243
index 6d92542e31..859d69812a 100644
52445244
--- a/src/go/build/deps_test.go
@@ -5307,8 +5307,8 @@ index ceff24193d..7ce13d24e6 100644
53075307
+++ b/src/internal/goexperiment/flags.go
53085308
@@ -129,4 +129,6 @@ type Flags struct {
53095309

5310-
// SizeSpecializedMalloc enables malloc implementations that are specialized per size class.
5311-
SizeSpecializedMalloc bool
5310+
// GoroutineLeakProfile enables the collection of goroutine leak profiles.
5311+
GoroutineLeakProfile bool
53125312
+
53135313
+ StrictFIPSRuntime bool
53145314
}

0 commit comments

Comments
 (0)