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

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

Author: bot-for-go[bot]

go

@@ -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 3bfe7fe20966a6..dbb6b56c48cc20 100644
+index 96273c0fe0ea2f..11d32bbc1c2551 100644
 --- a/src/crypto/tls/fips140_test.go
 +++ b/src/crypto/tls/fips140_test.go
 @@ -14,6 +14,7 @@ import (
@@ -467,7 +467,7 @@ index 00000000000000..b1bdb31863cc7a
 +	}
 +}
 diff --git a/src/crypto/tls/tls_test.go b/src/crypto/tls/tls_test.go
-index 39ebb9d2f1edd3..9bb2d0801111c2 100644
+index 4513008a5f930e..e1f868e7086061 100644
 --- a/src/crypto/tls/tls_test.go
 +++ b/src/crypto/tls/tls_test.go
 @@ -21,6 +21,7 @@ import (
@@ -490,7 +490,7 @@ index 39ebb9d2f1edd3..9bb2d0801111c2 100644
  }
 
  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)
  		}
@@ -500,7 +500,7 @@ index 39ebb9d2f1edd3..9bb2d0801111c2 100644
  		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 {
@@ -512,7 +512,7 @@ index 39ebb9d2f1edd3..9bb2d0801111c2 100644
  		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) {
@@ -640,7 +640,7 @@ index 09be2eb0807932..b74b311279e81f 100644
 +	}
 +}
 diff --git a/src/internal/syscall/windows/zsyscall_windows.go b/src/internal/syscall/windows/zsyscall_windows.go
-index d087fd46f6b27b..c7b04451fed945 100644
+index 9526e855e8f1ba..49873764aea3a1 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 {
@@ -651,16 +651,16 @@ index d087fd46f6b27b..c7b04451fed945 100644
  	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")
-@@ -244,6 +247,19 @@ func SetTokenInformation(tokenHandle syscall.Token, tokenInformationClass uint32
+@@ -271,6 +274,19 @@ func SetTokenInformation(tokenHandle syscall.Token, tokenInformationClass uint32
  	return
  }