Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go
Submodule go updated 135 files
18 changes: 10 additions & 8 deletions patches/0008-Implement-ms_tls_config_schannel-experiment.patch
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ index 00000000000000..c38f52f42fa26b
+ }
+}
diff --git a/src/crypto/tls/tls_test.go b/src/crypto/tls/tls_test.go
index 3db1365a971349..e82298dd26c997 100644
index 2bfb645e2c8e60..5edb2a19c1316e 100644
--- a/src/crypto/tls/tls_test.go
+++ b/src/crypto/tls/tls_test.go
@@ -24,6 +24,7 @@ import (
Expand Down Expand Up @@ -611,22 +611,24 @@ index 00000000000000..a2dbc6187da2a0
+const MS_TLS_Config_Schannel = true
+const MS_TLS_Config_SchannelInt = 1
diff --git a/src/internal/goexperiment/flags.go b/src/internal/goexperiment/flags.go
index 5f09ad11a701e2..ca710118b41336 100644
index 48f3c8f4060be8..8e16ada8b435b7 100644
--- a/src/internal/goexperiment/flags.go
+++ b/src/internal/goexperiment/flags.go
@@ -154,4 +154,12 @@ type Flags struct {

// GenericMethods enables use of generic methods.
GenericMethods bool
+
@@ -55,6 +55,14 @@ package goexperiment
//
// If you change this struct definition, run "go generate".
type Flags struct {
+ // MS_TLS_Config_Schannel enables the filtering and ordering of cipher
+ // suites according to the Windows Schannel settings.
+ //
+ // Does nothing on Windows Server 2012 (Windows 8) and earlier. In these
+ // versions, very few cipher suites are implemented by both Windows and Go,
+ // so it's unlikely the resulting TLS configuration will be usable.
+ MS_TLS_Config_Schannel bool
}
+
FieldTrack bool
PreemptibleLoops bool
StaticLockRanking bool
diff --git a/src/internal/syscall/windows/security_windows.go b/src/internal/syscall/windows/security_windows.go
index f0ab52ac819baf..d6ef32c0e5c089 100644
--- a/src/internal/syscall/windows/security_windows.go
Expand Down
22 changes: 22 additions & 0 deletions patches/0012-fix-TestFortran.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: bot-for-go[bot] <199222863+bot-for-go[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2026 10:01:42 +0200
Subject: [PATCH] fix TestFortran

---
src/cmd/cgo/internal/testfortran/fortran_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cmd/cgo/internal/testfortran/fortran_test.go b/src/cmd/cgo/internal/testfortran/fortran_test.go
index 1decd138bc4a31..243b7aeded79f4 100644
--- a/src/cmd/cgo/internal/testfortran/fortran_test.go
+++ b/src/cmd/cgo/internal/testfortran/fortran_test.go
@@ -47,7 +47,7 @@ func TestFortran(t *testing.T) {
switch runtime.GOOS {
case "darwin":
libExt = "dylib"
- case "aix", "openbsd":
+ case "windows", "aix", "openbsd":
libExt = "a"
}
libName := "libgfortran." + libExt