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

Update submodule to latest `master` in `microsoft/main`
microsoft · Oct 1, 2024 · 84de1c5 · 84de1c5
2 parents d82903d + 0d4c62c
commit 84de1c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/go b/go
diff --git a/patches/0002-Add-crypto-backend-foundation.patch b/patches/0002-Add-crypto-backend-foundation.patch
@@ -1097,8 +1097,8 @@ index e996e7aaa36b9c..55ca642491ec03 100644
  	"hash"
  	"io"
 @@ -296,7 +296,7 @@ func SignPSS(rand io.Reader, priv *PrivateKey, hash crypto.Hash, digest []byte,
- 	// well-specified number of random bytes is included in the signature, in a
- 	// well-specified way.
+ 		hash = opts.Hash
+ 	}
 
 -	if boring.Enabled && rand == boring.RandReader {
 +	if boring.Enabled && rand == boring.RandReader && boring.SupportsHash(hash) {
@@ -1731,7 +1731,7 @@ index 441cf8d051c934..ca6a512bf95c7e 100644
 +	< crypto/internal/backend
  	< crypto/boring;
 
- 	crypto/internal/alias
+ 	crypto/internal/alias, math/rand/v2
 @@ -496,6 +499,7 @@ var depsRules = `
  	# CRYPTO-MATH is core bignum-based crypto - no cgo, net; fmt now ok.
  	CRYPTO, FMT, math/big

diff --git a/patches/0005-Add-CNG-crypto-backend.patch b/patches/0005-Add-CNG-crypto-backend.patch
@@ -683,8 +683,8 @@ index 55ca642491ec03..7ff4d5150d1ddc 100644
  		if err != nil {
  			return nil, err
 @@ -296,7 +296,9 @@ func SignPSS(rand io.Reader, priv *PrivateKey, hash crypto.Hash, digest []byte,
- 	// well-specified number of random bytes is included in the signature, in a
- 	// well-specified way.
+ 		hash = opts.Hash
+ 	}
 
 -	if boring.Enabled && rand == boring.RandReader && boring.SupportsHash(hash) {
 +	if boring.Enabled && rand == boring.RandReader &&