Merge pull request #1975 from microsoft/dev/auto-sync/microsoft/main

Update submodule to latest `master` in `microsoft/main`

Author: bot-for-go[bot]

go

@@ -56,7 +56,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result
  .../github.com/golang-fips/openssl/v2/hash.go |  502 ++++
  .../golang-fips/openssl/v2/hashclone.go       |   14 +
  .../golang-fips/openssl/v2/hashclone_go125.go |    9 +
- .../github.com/golang-fips/openssl/v2/hkdf.go |  443 ++++
+ .../github.com/golang-fips/openssl/v2/hkdf.go |  455 ++++
  .../github.com/golang-fips/openssl/v2/hmac.go |  282 ++
  .../github.com/golang-fips/openssl/v2/init.go |  156 ++
  .../golang-fips/openssl/v2/init_cgo_unix.go   |   31 +
@@ -172,7 +172,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result
  .../go-crypto-darwin/xcrypto/hash.go          |  320 +++
  .../go-crypto-darwin/xcrypto/hashclone.go     |   17 +
  .../xcrypto/hashclone_go125.go                |   12 +
- .../go-crypto-darwin/xcrypto/hkdf.go          |   98 +
+ .../go-crypto-darwin/xcrypto/hkdf.go          |  103 +
  .../go-crypto-darwin/xcrypto/hmac.go          |  119 +
  .../go-crypto-darwin/xcrypto/mlkem.go         |  261 ++
  .../go-crypto-darwin/xcrypto/pbkdf2.go        |   68 +
@@ -192,7 +192,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result
  .../microsoft/go-crypto-winnative/cng/hash.go |  327 +++
  .../go-crypto-winnative/cng/hashclone.go      |   18 +
  .../cng/hashclone_go125.go                    |   13 +
- .../microsoft/go-crypto-winnative/cng/hkdf.go |  128 +
+ .../microsoft/go-crypto-winnative/cng/hkdf.go |  133 +
  .../microsoft/go-crypto-winnative/cng/hmac.go |   70 +
  .../microsoft/go-crypto-winnative/cng/keys.go |  220 ++
  .../go-crypto-winnative/cng/mlkem.go          |  405 +++
@@ -208,7 +208,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result
  .../internal/subtle/aliasing.go               |   32 +
  .../internal/sysdll/sys_windows.go            |   55 +
  src/vendor/modules.txt                        |   20 +
- 200 files changed, 28365 insertions(+), 7 deletions(-)
+ 200 files changed, 28387 insertions(+), 7 deletions(-)
  create mode 100644 src/cmd/internal/telemetry/counter/deps_ignore.go
  create mode 100644 src/cmd/vendor/github.com/microsoft/go-infra/telemetry/LICENSE
  create mode 100644 src/cmd/vendor/github.com/microsoft/go-infra/telemetry/README.md
@@ -2062,7 +2062,7 @@ index 00000000000000..ae4055d2d71303
 +// that are used by the backend package. This allows to track
 +// their versions in a single patch file.
 diff --git a/src/go.mod b/src/go.mod
-index e6cb3d5b43dbd3..74e965e12bc51c 100644
+index e6cb3d5b43dbd3..2e0ae71f40ce7d 100644
 --- a/src/go.mod
 +++ b/src/go.mod
 @@ -11,3 +11,9 @@ require (
@@ -2071,29 +2071,29 @@ index e6cb3d5b43dbd3..74e965e12bc51c 100644
  )
 +
 +require (
-+	github.com/golang-fips/openssl/v2 v2.0.4-0.20251121170104-ee24449e9207
-+	github.com/microsoft/go-crypto-darwin v0.0.3-0.20251125163641-ab43fa145f25
-+	github.com/microsoft/go-crypto-winnative v0.0.0-20251123214300-4a3429a42859
++	github.com/golang-fips/openssl/v2 v2.0.4-0.20251202083346-9b5f537f54f7
++	github.com/microsoft/go-crypto-darwin v0.0.3-0.20251202082849-356ad09993bc
++	github.com/microsoft/go-crypto-winnative v0.0.0-20251202082756-9cab7d2d4a79
 +)
 diff --git a/src/go.sum b/src/go.sum
-index fe184a864718af..66edcf6139c842 100644
+index fe184a864718af..2009043843940c 100644
 --- a/src/go.sum
 +++ b/src/go.sum
 @@ -1,3 +1,9 @@
-+github.com/golang-fips/openssl/v2 v2.0.4-0.20251121170104-ee24449e9207 h1:TsTK3Sg1Yf16FxSWpS1CLG09+nAz3EMCyzd5yENO/Ac=
-+github.com/golang-fips/openssl/v2 v2.0.4-0.20251121170104-ee24449e9207/go.mod h1:EtVnMfLGkB4pihGOH+tXEV0WlXxewWdT1n3GLJEHvpw=
-+github.com/microsoft/go-crypto-darwin v0.0.3-0.20251125163641-ab43fa145f25 h1:R/RbMmI+Vs521m63ALMrClhcgU8NxuZSBdsV87LtdO8=
-+github.com/microsoft/go-crypto-darwin v0.0.3-0.20251125163641-ab43fa145f25/go.mod h1:MTii5PQwRlfUjYpGoF8CPLGwXSHTbLHGRN9FVNML5N0=
-+github.com/microsoft/go-crypto-winnative v0.0.0-20251123214300-4a3429a42859 h1:CYCuHvY592PLaJFC2eaxyf9dS0dU2CTFJJyFSXLdpOI=
-+github.com/microsoft/go-crypto-winnative v0.0.0-20251123214300-4a3429a42859/go.mod h1:gD686525Li/blRSYwSzFJ6/LJQVFJp7Y0MKp+dmqFbc=
++github.com/golang-fips/openssl/v2 v2.0.4-0.20251202083346-9b5f537f54f7 h1:uRbVHzfzuY0m6zgFv0032WsSmYbM9dcZFtoXV5f1NRk=
++github.com/golang-fips/openssl/v2 v2.0.4-0.20251202083346-9b5f537f54f7/go.mod h1:EtVnMfLGkB4pihGOH+tXEV0WlXxewWdT1n3GLJEHvpw=
++github.com/microsoft/go-crypto-darwin v0.0.3-0.20251202082849-356ad09993bc h1:bz/6zng2sakr1ETJsKnGoHooH6sBKbQNxk9aeH5tRt0=
++github.com/microsoft/go-crypto-darwin v0.0.3-0.20251202082849-356ad09993bc/go.mod h1:MTii5PQwRlfUjYpGoF8CPLGwXSHTbLHGRN9FVNML5N0=
++github.com/microsoft/go-crypto-winnative v0.0.0-20251202082756-9cab7d2d4a79 h1:u3ZftMj7JpCAl4Ku8LUngqfn7pNuQG9mAsNMlSjBvDI=
++github.com/microsoft/go-crypto-winnative v0.0.0-20251202082756-9cab7d2d4a79/go.mod h1:gD686525Li/blRSYwSzFJ6/LJQVFJp7Y0MKp+dmqFbc=
  golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
  golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
  golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
 diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
-index 5f95535ed949d3..30ed09b5f755ac 100644
+index 8d5e11ec4e472b..00f53f3a181855 100644
 --- a/src/go/build/deps_test.go
 +++ b/src/go/build/deps_test.go
-@@ -532,6 +532,27 @@ var depsRules = `
+@@ -533,6 +533,27 @@ var depsRules = `
  	< crypto/internal/fips140/rsa
  	< FIPS < crypto/fips140;
 
@@ -2121,7 +2121,7 @@ index 5f95535ed949d3..30ed09b5f755ac 100644
  	crypto !< FIPS;
 
  	# CRYPTO is core crypto algorithms - no cgo, fmt, net.
-@@ -543,13 +564,12 @@ var depsRules = `
+@@ -544,13 +565,12 @@ var depsRules = `
  	FIPS, internal/godebug, embed,
  	crypto/internal/boring/sig,
  	crypto/internal/boring/syso,
@@ -2139,7 +2139,7 @@ index 5f95535ed949d3..30ed09b5f755ac 100644
  	< crypto/internal/boring
  	< crypto/boring
  	< crypto/aes,
-@@ -570,6 +590,10 @@ var depsRules = `
+@@ -571,6 +591,10 @@ var depsRules = `
 
  	# CRYPTO-MATH is crypto that exposes math/big APIs - no cgo, net; fmt now ok.
 
@@ -2150,7 +2150,7 @@ index 5f95535ed949d3..30ed09b5f755ac 100644
  	CRYPTO, FMT, math/big, internal/saferio
  	< crypto/internal/boring/bbig
  	< crypto/internal/fips140cache
-@@ -907,7 +931,7 @@ var buildIgnore = []byte("\n//go:build ignore")
+@@ -908,7 +932,7 @@ var buildIgnore = []byte("\n//go:build ignore")
 
  func findImports(pkg string) ([]string, error) {
  	vpkg := pkg
@@ -2159,7 +2159,7 @@ index 5f95535ed949d3..30ed09b5f755ac 100644
  		vpkg = "vendor/" + pkg
  	}
  	dir := filepath.Join(Default.GOROOT, "src", vpkg)
-@@ -917,7 +941,7 @@ func findImports(pkg string) ([]string, error) {
+@@ -918,7 +942,7 @@ func findImports(pkg string) ([]string, error) {
  	}
  	var imports []string
  	var haveImport = map[string]bool{}
@@ -2235,13 +2235,13 @@ index 00000000000000..97e85154015761
 \ No newline at end of file
 diff --git a/src/vendor/github.com/golang-fips/openssl/v2/README.md b/src/vendor/github.com/golang-fips/openssl/v2/README.md
 new file mode 100644
-index 00000000000000..f63cf39e70c064
+index 00000000000000..0a6d0d0ef2c0c6
 --- /dev/null
 +++ b/src/vendor/github.com/golang-fips/openssl/v2/README.md
 @@ -0,0 +1,66 @@
 +# Go OpenSSL bindings for FIPS compliance
 +
-+[![Go Reference](https://pkg.go.dev/badge/github.com/golang-fips/openssl.svg)](https://pkg.go.dev/github.com/golang-fips/openssl)
++[![Go Reference](https://pkg.go.dev/badge/github.com/golang-fips/openssl/v2.svg)](https://pkg.go.dev/github.com/golang-fips/openssl/v2)
 +
 +The `openssl` package implements Go crypto primitives using OpenSSL shared libraries and cgo. When configured correctly, OpenSSL can be executed in FIPS mode, making the `openssl` package FIPS compliant.
 +
@@ -5798,10 +5798,10 @@ index 00000000000000..f1f2364c7246d4
 +type HashCloner = hash.Cloner
 diff --git a/src/vendor/github.com/golang-fips/openssl/v2/hkdf.go b/src/vendor/github.com/golang-fips/openssl/v2/hkdf.go
 new file mode 100644
-index 00000000000000..3aeff4f917fdde
+index 00000000000000..5574cef3032db4
 --- /dev/null
 +++ b/src/vendor/github.com/golang-fips/openssl/v2/hkdf.go
-@@ -0,0 +1,443 @@
+@@ -0,0 +1,455 @@
 +//go:build !cmd_go_bootstrap && (cgo || goexperiment.ms_nocgo_opensslcrypto)
 +
 +package openssl
@@ -6012,6 +6012,12 @@ index 00000000000000..3aeff4f917fdde
 +			return nil, err
 +		}
 +		defer ossl.EVP_PKEY_CTX_free(ctx)
++		if len(out) == 0 {
++			// Nothing to do, so exit early.
++			// We also can't call EVP_PKEY_derive because some engines error on zero-length output.
++			// We can only exit after calling newHKDFCtx1 because we still need it to validate the parameters.
++			return out, nil
++		}
 +		keylen := keyLength
 +		if _, err := ossl.EVP_PKEY_derive(ctx, base(out), &keylen); err != nil {
 +			return nil, err
@@ -6022,6 +6028,12 @@ index 00000000000000..3aeff4f917fdde
 +			return nil, err
 +		}
 +		defer ossl.EVP_KDF_CTX_free(ctx)
++		if len(out) == 0 {
++			// Nothing to do, so exit early.
++			// We also can't call EVP_PKEY_derive because some engines error on zero-length output.
++			// We can only exit after calling newHKDFCtx3 because we still need it to validate the parameters.
++			return out, nil
++		}
 +		if _, err := ossl.EVP_KDF_derive(ctx, base(out), keyLength, nil); err != nil {
 +			return nil, err
 +		}
@@ -26175,10 +26187,10 @@ index 00000000000000..a4b0c717ef5e38
 +type HashCloner = hash.Cloner
 diff --git a/src/vendor/github.com/microsoft/go-crypto-darwin/xcrypto/hkdf.go b/src/vendor/github.com/microsoft/go-crypto-darwin/xcrypto/hkdf.go
 new file mode 100644
-index 00000000000000..e8fcbec33aaa66
+index 00000000000000..f6183de583d9ac
 --- /dev/null
 +++ b/src/vendor/github.com/microsoft/go-crypto-darwin/xcrypto/hkdf.go
-@@ -0,0 +1,98 @@
+@@ -0,0 +1,103 @@
 +// Copyright (c) Microsoft Corporation.
 +// Licensed under the MIT License.
 +
@@ -26254,6 +26266,11 @@ index 00000000000000..e8fcbec33aaa66
 +
 +	// Allocate buffer for derived key
 +	expandedKey := make([]byte, keyLength)
++	if len(expandedKey) == 0 {
++		// Nothing to do, and CryptoKit may error on zero-length output.
++		// We do need to validate the inputs for consistency, though.
++		return expandedKey, nil
++	}
 +
 +	result := cryptokit.ExpandHKDF(swiftHash, pseudorandomKey, info, expandedKey)
 +	if result != 0 {
@@ -29212,10 +29229,10 @@ index 00000000000000..f86a9e9bfd47a9
 +type HashCloner = hash.Cloner
 diff --git a/src/vendor/github.com/microsoft/go-crypto-winnative/cng/hkdf.go b/src/vendor/github.com/microsoft/go-crypto-winnative/cng/hkdf.go
 new file mode 100644
-index 00000000000000..2647c6bc06cd57
+index 00000000000000..aa48b084d708da
 --- /dev/null
 +++ b/src/vendor/github.com/microsoft/go-crypto-winnative/cng/hkdf.go
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,133 @@
 +// Copyright (c) Microsoft Corporation.
 +// Licensed under the MIT License.
 +
@@ -29244,7 +29261,7 @@ index 00000000000000..2647c6bc06cd57
 +	})
 +}
 +
-+func newHKDF(h func() hash.Hash, secret, salt []byte, info []byte) (bcrypt.KEY_HANDLE, error) {
++func newHKDF(h func() hash.Hash, secret, salt []byte) (bcrypt.KEY_HANDLE, error) {
 +	ch := h()
 +	hashID := hashToID(ch)
 +	if hashID == "" {
@@ -29281,7 +29298,7 @@ index 00000000000000..2647c6bc06cd57
 +		// Replicate x/crypto/hkdf behavior.
 +		salt = make([]byte, h().Size())
 +	}
-+	kh, err := newHKDF(h, secret, salt, nil)
++	kh, err := newHKDF(h, secret, salt)
 +	if err != nil {
 +		return nil, err
 +	}
@@ -29311,12 +29328,17 @@ index 00000000000000..2647c6bc06cd57
 +
 +// ExpandHKDF derives a key from the given hash, key, and optional context info.
 +func ExpandHKDF(h func() hash.Hash, pseudorandomKey, info []byte, keyLength int) ([]byte, error) {
-+	kh, err := newHKDF(h, pseudorandomKey, nil, info)
++	kh, err := newHKDF(h, pseudorandomKey, nil)
 +	if err != nil {
 +		return nil, err
 +	}
 +	defer bcrypt.DestroyKey(kh)
 +	out := make([]byte, keyLength)
++	if len(out) == 0 {
++		// Nothing to do, and CNG doesn't like zero-length output buffers.
++		// Call newHKDF, though, to validate parameters.
++		return out, nil
++	}
 +	var params *bcrypt.BufferDesc
 +	if len(info) > 0 {
 +		params = &bcrypt.BufferDesc{
@@ -31947,24 +31969,24 @@ index 00000000000000..1722410e5af193
 +	return getSystemDirectory() + "\\" + dll
 +}
 diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
-index bf7a797966088f..7f126bacec3e31 100644
+index bf7a797966088f..ab59dd4cf3dc4a 100644
 --- a/src/vendor/modules.txt
 +++ b/src/vendor/modules.txt
 @@ -1,3 +1,23 @@
-+# github.com/golang-fips/openssl/v2 v2.0.4-0.20251121170104-ee24449e9207
++# github.com/golang-fips/openssl/v2 v2.0.4-0.20251202083346-9b5f537f54f7
 +## explicit; go 1.24
 +github.com/golang-fips/openssl/v2
 +github.com/golang-fips/openssl/v2/bbig
 +github.com/golang-fips/openssl/v2/internal/fakecgo
 +github.com/golang-fips/openssl/v2/internal/ossl
-+# github.com/microsoft/go-crypto-darwin v0.0.3-0.20251125163641-ab43fa145f25
++# github.com/microsoft/go-crypto-darwin v0.0.3-0.20251202082849-356ad09993bc
 +## explicit; go 1.24
 +github.com/microsoft/go-crypto-darwin/bbig
 +github.com/microsoft/go-crypto-darwin/internal/commoncrypto
 +github.com/microsoft/go-crypto-darwin/internal/cryptokit
 +github.com/microsoft/go-crypto-darwin/internal/security
 +github.com/microsoft/go-crypto-darwin/xcrypto
-+# github.com/microsoft/go-crypto-winnative v0.0.0-20251123214300-4a3429a42859
++# github.com/microsoft/go-crypto-winnative v0.0.0-20251202082756-9cab7d2d4a79
 +## explicit; go 1.24
 +github.com/microsoft/go-crypto-winnative/cng
 +github.com/microsoft/go-crypto-winnative/cng/bbig

patches/0001-Vendor-external-dependencies.patch

@@ -11,7 +11,6 @@ desired goexperiments and build tags.
 ---
  .gitignore                                    |   2 +
  .../compile/internal/logopt/logopt_test.go    |   6 +-
- .../compile/internal/ssa/stmtlines_test.go    |   2 +-
  src/cmd/compile/script_test.go                |   8 +
  src/cmd/dist/build.go                         |  80 +++-
  src/cmd/dist/test.go                          |  43 +-
@@ -121,19 +120,6 @@ index 1edabf9fb7ff04..026f8cb0278ab6 100644
  			goos0 = "linux"
  		}
 
-diff --git a/src/cmd/compile/internal/ssa/stmtlines_test.go b/src/cmd/compile/internal/ssa/stmtlines_test.go
-index 2bdd6c80b2d66c..8f7b7bc9726d1f 100644
---- a/src/cmd/compile/internal/ssa/stmtlines_test.go
-+++ b/src/cmd/compile/internal/ssa/stmtlines_test.go
-@@ -140,7 +140,7 @@ func TestStmtLines(t *testing.T) {
- 	var m float64
- 	switch runtime.GOARCH {
- 	case "amd64":
--		m = 0.0111 // > 98.89% obtained on amd64, no backsliding
-+		m = 0.012 // > 98.8% obtained on amd64, no backsliding
- 	case "riscv64":
- 		m = 0.03 // XXX temporary update threshold to 97% for regabi
- 	default:
 diff --git a/src/cmd/compile/script_test.go b/src/cmd/compile/script_test.go
 index 0e32e0769ee2e2..eda2d576acc6c6 100644
 --- a/src/cmd/compile/script_test.go