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 VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
go1.25.6
go1.25.14
Comment thread
dagood marked this conversation as resolved.
Resolved
2 changes: 1 addition & 1 deletion go
Submodule go updated 239 files
256 changes: 128 additions & 128 deletions patches/0001-Vendor-external-dependencies.patch

Large diffs are not rendered by default.

184 changes: 92 additions & 92 deletions patches/0004-Use-crypto-backends.patch

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions patches/0011-Implement-ms_tls_config_schannel-experiment.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Subject: [PATCH] Implement ms_tls_config_schannel experiment
create mode 100644 src/internal/goexperiment/exp_ms_tls_config_schannel_on.go

diff --git a/src/crypto/tls/fips140_test.go b/src/crypto/tls/fips140_test.go
index 711ce750a71a93f512b132dfcb49253629fe6aa7..05312aaf9bcb9dc1b7469d59d6caf34d8788a6b8 100644
index 711ce750a71a93..05312aaf9bcb9d 100644
--- a/src/crypto/tls/fips140_test.go
+++ b/src/crypto/tls/fips140_test.go
@@ -14,6 +14,7 @@ import (
Expand All @@ -47,7 +47,7 @@ index 711ce750a71a93f512b132dfcb49253629fe6aa7..05312aaf9bcb9dc1b7469d59d6caf34d
random: make([]byte, 32),
diff --git a/src/crypto/tls/schannel_disabled_test.go b/src/crypto/tls/schannel_disabled_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..d598d48dedf762be939e694733c8fc105b7c76a4
index 00000000000000..d598d48dedf762
--- /dev/null
+++ b/src/crypto/tls/schannel_disabled_test.go
@@ -0,0 +1,11 @@
Expand All @@ -64,7 +64,7 @@ index 0000000000000000000000000000000000000000..d598d48dedf762be939e694733c8fc10
+}
diff --git a/src/crypto/tls/schannel_windows.go b/src/crypto/tls/schannel_windows.go
new file mode 100644
index 0000000000000000000000000000000000000000..cccfb8866f88ab0ac13e7679e433ba4369d9fbab
index 00000000000000..cccfb8866f88ab
--- /dev/null
+++ b/src/crypto/tls/schannel_windows.go
@@ -0,0 +1,166 @@
Expand Down Expand Up @@ -236,7 +236,7 @@ index 0000000000000000000000000000000000000000..cccfb8866f88ab0ac13e7679e433ba43
+}
diff --git a/src/crypto/tls/schannel_windows_test.go b/src/crypto/tls/schannel_windows_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..b1bdb31863cc7ab79cea57544727fd5f1fccded9
index 00000000000000..b1bdb31863cc7a
--- /dev/null
+++ b/src/crypto/tls/schannel_windows_test.go
@@ -0,0 +1,226 @@
Expand Down Expand Up @@ -467,7 +467,7 @@ index 0000000000000000000000000000000000000000..b1bdb31863cc7ab79cea57544727fd5f
+ }
+}
diff --git a/src/crypto/tls/tls_test.go b/src/crypto/tls/tls_test.go
index 0a791bd7b709b604b3d31976c635dcc2cfc1104b..4d77be9a5bd2cbb218cc9c6ff2512216d606190b 100644
index 40817a2378b3e7..62f8639bd9a63a 100644
--- a/src/crypto/tls/tls_test.go
+++ b/src/crypto/tls/tls_test.go
@@ -21,6 +21,7 @@ import (
Expand All @@ -490,7 +490,7 @@ index 0a791bd7b709b604b3d31976c635dcc2cfc1104b..4d77be9a5bd2cbb218cc9c6ff2512216
}

func TestDialTimeout(t *testing.T) {
@@ -1289,6 +1295,9 @@ func TestConnectionState(t *testing.T) {
@@ -1324,6 +1330,9 @@ func TestConnectionState(t *testing.T) {
if !isFIPSVersion(v) && fips140tls.Required() {
t.Skipf("skipping test in FIPS 140-3 mode for non-FIPS version %x", v)
}
Expand All @@ -500,7 +500,7 @@ index 0a791bd7b709b604b3d31976c635dcc2cfc1104b..4d77be9a5bd2cbb218cc9c6ff2512216
var name string
switch v {
case VersionTLS10:
@@ -1532,6 +1541,11 @@ func TestClientHelloInfo_SupportsCertificate(t *testing.T) {
@@ -1567,6 +1576,11 @@ func TestClientHelloInfo_SupportsCertificate(t *testing.T) {
}, ""}, // static RSA fallback
}
for i, tt := range tests {
Expand All @@ -512,7 +512,7 @@ index 0a791bd7b709b604b3d31976c635dcc2cfc1104b..4d77be9a5bd2cbb218cc9c6ff2512216
err := tt.chi.SupportsCertificate(tt.c)
switch {
case tt.wantErr == "" && err != nil:
@@ -1545,6 +1559,11 @@ func TestClientHelloInfo_SupportsCertificate(t *testing.T) {
@@ -1580,6 +1594,11 @@ func TestClientHelloInfo_SupportsCertificate(t *testing.T) {
}

func TestCipherSuites(t *testing.T) {
Expand All @@ -526,7 +526,7 @@ index 0a791bd7b709b604b3d31976c635dcc2cfc1104b..4d77be9a5bd2cbb218cc9c6ff2512216
if lastID > c.ID {
diff --git a/src/internal/goexperiment/exp_ms_tls_config_schannel_off.go b/src/internal/goexperiment/exp_ms_tls_config_schannel_off.go
new file mode 100644
index 0000000000000000000000000000000000000000..db7790d1a1f1b94355c968ba4fed4c9b7ac7a5f6
index 00000000000000..db7790d1a1f1b9
--- /dev/null
+++ b/src/internal/goexperiment/exp_ms_tls_config_schannel_off.go
@@ -0,0 +1,8 @@
Expand All @@ -540,7 +540,7 @@ index 0000000000000000000000000000000000000000..db7790d1a1f1b94355c968ba4fed4c9b
+const MS_TLS_Config_SchannelInt = 0
diff --git a/src/internal/goexperiment/exp_ms_tls_config_schannel_on.go b/src/internal/goexperiment/exp_ms_tls_config_schannel_on.go
new file mode 100644
index 0000000000000000000000000000000000000000..a2dbc6187da2a0cad6994aeacc54758f3c613e2f
index 00000000000000..a2dbc6187da2a0
--- /dev/null
+++ b/src/internal/goexperiment/exp_ms_tls_config_schannel_on.go
@@ -0,0 +1,8 @@
Expand All @@ -553,7 +553,7 @@ index 0000000000000000000000000000000000000000..a2dbc6187da2a0cad6994aeacc54758f
+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 04f8fce2dfed03178d02bf1d3bfe5dc4581aa3c7..3d55cf3e6f7cbc98884123950e07da89b1f3bea5 100644
index 04f8fce2dfed03..3d55cf3e6f7cbc 100644
--- a/src/internal/goexperiment/flags.go
+++ b/src/internal/goexperiment/flags.go
@@ -147,4 +147,12 @@ type Flags struct {
Expand All @@ -570,7 +570,7 @@ index 04f8fce2dfed03178d02bf1d3bfe5dc4581aa3c7..3d55cf3e6f7cbc98884123950e07da89
+ MS_TLS_Config_Schannel bool
}
diff --git a/src/internal/syscall/windows/security_windows.go b/src/internal/syscall/windows/security_windows.go
index f0ab52ac819baf74d29698ff76671c34d648f754..d6ef32c0e5c0897fa435e4e786046bbbc2688a19 100644
index f0ab52ac819baf..d6ef32c0e5c089 100644
--- a/src/internal/syscall/windows/security_windows.go
+++ b/src/internal/syscall/windows/security_windows.go
@@ -262,3 +262,31 @@ func GetSidSubAuthorityCount(sid *syscall.SID) uint8 {
Expand Down Expand Up @@ -606,7 +606,7 @@ index f0ab52ac819baf74d29698ff76671c34d648f754..d6ef32c0e5c0897fa435e4e786046bbb
+//sys BCryptFreeBuffer(buffer unsafe.Pointer) = bcrypt.BCryptFreeBuffer
+//sys BCryptEnumContextFunctions(table uint32, context *uint16, iface uint32, bufferSize *uint32, buffer **CRYPT_CONTEXT_FUNCTIONS) (ntstatus error) = bcrypt.BCryptEnumContextFunctions
diff --git a/src/internal/syscall/windows/version_windows.go b/src/internal/syscall/windows/version_windows.go
index 5edf7a01e270d498cb9432908d6169d96adf78db..3cb6af21f52978136332ed7ffda4738429938f19 100644
index 5edf7a01e270d4..3cb6af21f52978 100644
--- a/src/internal/syscall/windows/version_windows.go
+++ b/src/internal/syscall/windows/version_windows.go
@@ -136,3 +136,14 @@ var SupportUnixSocket = sync.OnceValue(func() bool {
Expand All @@ -625,7 +625,7 @@ index 5edf7a01e270d498cb9432908d6169d96adf78db..3cb6af21f52978136332ed7ffda47384
+ return major >= 10
+}
diff --git a/src/internal/syscall/windows/version_windows_test.go b/src/internal/syscall/windows/version_windows_test.go
index 09be2eb0807932f64e980f4af4a5f648008deaf9..b74b311279e81f11f6fc00504677dbe87bf72525 100644
index 09be2eb0807932..b74b311279e81f 100644
--- a/src/internal/syscall/windows/version_windows_test.go
+++ b/src/internal/syscall/windows/version_windows_test.go
@@ -29,3 +29,10 @@ func TestSupportUnixSocket(t *testing.T) {
Expand All @@ -640,7 +640,7 @@ index 09be2eb0807932f64e980f4af4a5f648008deaf9..b74b311279e81f11f6fc00504677dbe8
+ }
+}
diff --git a/src/internal/syscall/windows/zsyscall_windows.go b/src/internal/syscall/windows/zsyscall_windows.go
index ba6c017ea96458aba61fde6be53164c68cd7cfc3..0185a5a6361875186c1bfcd629d61af7521130c2 100644
index 6937fea044e5be..95ce46d44206e3 100644
--- a/src/internal/syscall/windows/zsyscall_windows.go
+++ b/src/internal/syscall/windows/zsyscall_windows.go
@@ -38,6 +38,7 @@ func errnoErr(e syscall.Errno) error {
Expand All @@ -651,16 +651,16 @@ index ba6c017ea96458aba61fde6be53164c68cd7cfc3..0185a5a6361875186c1bfcd629d61af7
modbcryptprimitives = syscall.NewLazyDLL(sysdll.Add("bcryptprimitives.dll"))
modiphlpapi = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
modkernel32 = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
@@ -63,6 +64,8 @@ var (
procQueryServiceStatus = modadvapi32.NewProc("QueryServiceStatus")
procRevertToSelf = modadvapi32.NewProc("RevertToSelf")
@@ -65,6 +66,8 @@ var (
procSetEntriesInAclW = modadvapi32.NewProc("SetEntriesInAclW")
procSetNamedSecurityInfoW = modadvapi32.NewProc("SetNamedSecurityInfoW")
procSetTokenInformation = modadvapi32.NewProc("SetTokenInformation")
+ procBCryptEnumContextFunctions = modbcrypt.NewProc("BCryptEnumContextFunctions")
+ procBCryptFreeBuffer = modbcrypt.NewProc("BCryptFreeBuffer")
procProcessPrng = modbcryptprimitives.NewProc("ProcessPrng")
procGetAdaptersAddresses = modiphlpapi.NewProc("GetAdaptersAddresses")
procCreateEventW = modkernel32.NewProc("CreateEventW")
@@ -243,6 +246,19 @@ func SetTokenInformation(tokenHandle syscall.Token, tokenInformationClass uint32
@@ -270,6 +273,19 @@ func SetTokenInformation(tokenHandle syscall.Token, tokenInformationClass uint32
return
}

Expand Down

This file was deleted.

41 changes: 0 additions & 41 deletions patches/0016-net-fix-TestLookupCNAME.patch

This file was deleted.

Loading
Loading