Merge pull request #884 from microsoft/dev/auto-sync/microsoft/releas…

…e-branch.go1.19 Update submodule to latest `release-branch.go1.19` in `microsoft/release-branch.go1.19`
microsoft · Mar 7, 2023 · a0d4063 · a0d4063
2 parents a595ad2 + 301a6f3
commit a0d4063
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/go b/go
diff --git a/patches/0005-Add-OpenSSL-crypto-backend.patch b/patches/0005-Add-OpenSSL-crypto-backend.patch
@@ -530,7 +530,7 @@ index 1827f764589b58..70baa62d63754a 100644
  package tls
 
 diff --git a/src/crypto/tls/boring_test.go b/src/crypto/tls/boring_test.go
-index 59d4d2b2724ea3..ea23a0336bd575 100644
+index ba68f355eb037c..929111d8679cc2 100644
 --- a/src/crypto/tls/boring_test.go
 +++ b/src/crypto/tls/boring_test.go
 @@ -2,7 +2,7 @@
@@ -595,7 +595,7 @@ index 095b58c31590d4..9aec21dbcd3bff 100644
  package x509
 
 diff --git a/src/crypto/x509/boring_test.go b/src/crypto/x509/boring_test.go
-index 90fe2a72276c56..457cd95b9ca17a 100644
+index 33fd0ed52b1ff6..e8fce393d29b00 100644
 --- a/src/crypto/x509/boring_test.go
 +++ b/src/crypto/x509/boring_test.go
 @@ -2,7 +2,7 @@
@@ -621,7 +621,7 @@ index c83a7272c9f01f..a0548a7f9179c5 100644
  package x509
 
 diff --git a/src/go.mod b/src/go.mod
-index 62f3489183e12c..0441449d83ca73 100644
+index dc4b1a77d25e96..c9b19f6a5950bb 100644
 --- a/src/go.mod
 +++ b/src/go.mod
 @@ -3,6 +3,7 @@ module std
@@ -630,18 +630,18 @@ index 62f3489183e12c..0441449d83ca73 100644
  require (
 +	github.com/microsoft/go-crypto-openssl v0.2.6
  	golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8
- 	golang.org/x/net v0.0.0-20221214163817-183621ab9c4e
+ 	golang.org/x/net v0.0.0-20230214200805-d99f623d45a4
  )
 diff --git a/src/go.sum b/src/go.sum
-index 5857a41946b7ad..55c43a99afa057 100644
+index 18402b8778cc35..409c131ec382d1 100644
 --- a/src/go.sum
 +++ b/src/go.sum
 @@ -1,3 +1,5 @@
 +github.com/microsoft/go-crypto-openssl v0.2.6 h1:qufiwqJsKT/fKrzAlAA8YPCmSshxBxSqih/4S1VoTIk=
 +github.com/microsoft/go-crypto-openssl v0.2.6/go.mod h1:rC+rtBU3m60UCQifBmpWII0VETfu78w6YGZQvVc0rd4=
  golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs=
  golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
- golang.org/x/net v0.0.0-20221214163817-183621ab9c4e h1:ny/17Y8U4fgn9XOKSWpD8Fgz3CD+msKsE74LF845pIg=
+ golang.org/x/net v0.0.0-20230214200805-d99f623d45a4 h1:iaVaPFITmD6a3T5kPUYNWiaNrPvSEl6s+xvx6B9yfR0=
 diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
 index 11007189004900..8b97e3ec146c55 100644
 --- a/src/go/build/deps_test.go

diff --git a/patches/0006-Add-CNG-crypto-backend.patch b/patches/0006-Add-CNG-crypto-backend.patch
@@ -968,7 +968,7 @@ index 70baa62d63754a..ecd0f5a7b3e9ed 100644
  package tls
 
 diff --git a/src/crypto/tls/boring_test.go b/src/crypto/tls/boring_test.go
-index ea23a0336bd575..b117e47ba3a2c1 100644
+index 929111d8679cc2..3e63ba6a053c42 100644
 --- a/src/crypto/tls/boring_test.go
 +++ b/src/crypto/tls/boring_test.go
 @@ -2,7 +2,7 @@
@@ -1007,7 +1007,7 @@ index 9c1d3d279c472f..0ca7a863b73690 100644
  package fipsonly
 
 diff --git a/src/crypto/tls/handshake_server_tls13.go b/src/crypto/tls/handshake_server_tls13.go
-index 03a477f7bed54b..8a925899d00d28 100644
+index 0043e16b3188d9..4ab564ba1d97eb 100644
 --- a/src/crypto/tls/handshake_server_tls13.go
 +++ b/src/crypto/tls/handshake_server_tls13.go
 @@ -13,6 +13,7 @@ import (
@@ -1018,7 +1018,7 @@ index 03a477f7bed54b..8a925899d00d28 100644
  	"io"
  	"sync/atomic"
  	"time"
-@@ -334,6 +335,15 @@ func cloneHash(in hash.Hash, h crypto.Hash) hash.Hash {
+@@ -339,6 +340,15 @@ func cloneHash(in hash.Hash, h crypto.Hash) hash.Hash {
  	}
  	marshaler, ok := in.(binaryMarshaler)
  	if !ok {
@@ -1061,7 +1061,7 @@ index 9aec21dbcd3bff..05324f731bedc4 100644
  package x509
 
 diff --git a/src/crypto/x509/boring_test.go b/src/crypto/x509/boring_test.go
-index 457cd95b9ca17a..be7576892e01d7 100644
+index e8fce393d29b00..9818c9b7d6b6b8 100644
 --- a/src/crypto/x509/boring_test.go
 +++ b/src/crypto/x509/boring_test.go
 @@ -2,7 +2,7 @@
@@ -1087,7 +1087,7 @@ index a0548a7f9179c5..ae6117a1554b7f 100644
  package x509
 
 diff --git a/src/go.mod b/src/go.mod
-index 0441449d83ca73..bda51006e2fa3e 100644
+index c9b19f6a5950bb..0feb6949d71457 100644
 --- a/src/go.mod
 +++ b/src/go.mod
 @@ -4,6 +4,7 @@ go 1.19
@@ -1096,10 +1096,10 @@ index 0441449d83ca73..bda51006e2fa3e 100644
  	github.com/microsoft/go-crypto-openssl v0.2.6
 +	github.com/microsoft/go-crypto-winnative v0.0.0-20221003180653-84bf0c539a8e
  	golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8
- 	golang.org/x/net v0.0.0-20221214163817-183621ab9c4e
+ 	golang.org/x/net v0.0.0-20230214200805-d99f623d45a4
  )
 diff --git a/src/go.sum b/src/go.sum
-index 55c43a99afa057..c61b79fffbb45a 100644
+index 409c131ec382d1..f747fd8c804806 100644
 --- a/src/go.sum
 +++ b/src/go.sum
 @@ -1,5 +1,7 @@
@@ -1109,7 +1109,7 @@ index 55c43a99afa057..c61b79fffbb45a 100644
 +github.com/microsoft/go-crypto-winnative v0.0.0-20221003180653-84bf0c539a8e/go.mod h1:fveERXKbeK+XLmOyU24caKnIT/S5nniAX9XCRHfnrM4=
  golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs=
  golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
- golang.org/x/net v0.0.0-20221214163817-183621ab9c4e h1:ny/17Y8U4fgn9XOKSWpD8Fgz3CD+msKsE74LF845pIg=
+ golang.org/x/net v0.0.0-20230214200805-d99f623d45a4 h1:iaVaPFITmD6a3T5kPUYNWiaNrPvSEl6s+xvx6B9yfR0=
 diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
 index 8b97e3ec146c55..24b6043dffa583 100644
 --- a/src/go/build/deps_test.go
+1 −1		VERSION
+0 −2		src/cmd/internal/moddeps/moddeps_test.go
+20 −3		src/cmd/link/internal/arm/asm.go
+81 −0		src/crypto/internal/nistec/nistec_test.go
+17 −0		src/crypto/internal/nistec/p256_asm.go
+1 −0		src/crypto/internal/nistec/p256_asm_ordinv.go
+3 −2		src/crypto/x509/root_darwin.go
+1 −1		src/crypto/x509/root_unix_test.go
+264 −276		src/crypto/x509/verify_test.go
+1 −1		src/go.mod
+2 −2		src/go.sum
+1 −1		src/internal/poll/fd_poll_runtime.go
+0 −44		src/net/tcpsock_test.go
+22 −3		src/runtime/mgcsweep.go
+1 −1		src/sync/atomic/value.go
+14 −10		src/syscall/env_windows.go
+1 −1		src/vendor/modules.txt