From 9046a28f8c39bb4f77793520c2559ce0693e294d Mon Sep 17 00:00:00 2001 From: microsoft-golang-bot Date: Mon, 16 Oct 2023 16:02:53 +0000 Subject: [PATCH 1/3] Update submodule to latest master (5873bd1d): html/template: track brace depth for each nested expression --- go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go b/go index 14c347f5ce9..5873bd1d7e8 160000 --- a/go +++ b/go @@ -1 +1 @@ -Subproject commit 14c347f5ce924b5a0f05ec5737984cfeb294d9ac +Subproject commit 5873bd1d7e87e0686390d71a840a44e2e2c3e11d From e35daf8e9b5a9fc83f535db371f609b7ec33d4b6 Mon Sep 17 00:00:00 2001 From: George Adams Date: Mon, 16 Oct 2023 21:06:07 +0100 Subject: [PATCH 2/3] fix merge conflicts in patches --- go | 2 +- .../0002-Add-crypto-backend-foundation.patch | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go b/go index 5873bd1d7e8..991b8cd8865 160000 --- a/go +++ b/go @@ -1 +1 @@ -Subproject commit 5873bd1d7e87e0686390d71a840a44e2e2c3e11d +Subproject commit 991b8cd886593a5a0d01a7d6297aea42b27013f6 diff --git a/patches/0002-Add-crypto-backend-foundation.patch b/patches/0002-Add-crypto-backend-foundation.patch index ddd8d57649b..5876d590a17 100644 --- a/patches/0002-Add-crypto-backend-foundation.patch +++ b/patches/0002-Add-crypto-backend-foundation.patch @@ -56,7 +56,7 @@ Subject: [PATCH] Add crypto backend foundation create mode 100644 src/crypto/internal/backend/stub.s diff --git a/src/crypto/aes/cipher.go b/src/crypto/aes/cipher.go -index 183c1697c867b2..64855f153f1ea7 100644 +index a9e6208696dae8..9dd2f28861dd66 100644 --- a/src/crypto/aes/cipher.go +++ b/src/crypto/aes/cipher.go @@ -7,7 +7,7 @@ package aes @@ -95,7 +95,7 @@ index 097c37e343fdb8..1cf43edba40359 100644 // Enabled reports whether BoringCrypto handles supported crypto operations. func Enabled() bool { diff --git a/src/crypto/des/cipher.go b/src/crypto/des/cipher.go -index 699e5177aef5d5..7e9c2a74adf74b 100644 +index b0f456e6921244..0c11654b03405b 100644 --- a/src/crypto/des/cipher.go +++ b/src/crypto/des/cipher.go @@ -7,6 +7,7 @@ package des @@ -127,7 +127,7 @@ index 699e5177aef5d5..7e9c2a74adf74b 100644 c := new(tripleDESCipher) c.cipher1.generateSubkeys(key[:8]) diff --git a/src/crypto/ecdh/ecdh.go b/src/crypto/ecdh/ecdh.go -index b21b5697d0e37f..5e373cd27b350f 100644 +index b7c26f91e57f02..7a12e2bbaaafd1 100644 --- a/src/crypto/ecdh/ecdh.go +++ b/src/crypto/ecdh/ecdh.go @@ -8,7 +8,7 @@ package ecdh @@ -140,7 +140,7 @@ index b21b5697d0e37f..5e373cd27b350f 100644 "errors" "io" diff --git a/src/crypto/ecdh/nist.go b/src/crypto/ecdh/nist.go -index 01354fa2cf0af2..1d198df6e382d4 100644 +index b3664915449b95..c4090a3268e7b7 100644 --- a/src/crypto/ecdh/nist.go +++ b/src/crypto/ecdh/nist.go @@ -5,7 +5,7 @@ @@ -168,7 +168,7 @@ index 275c60b4de49eb..61e70f981db4eb 100644 "math/big" ) diff --git a/src/crypto/ecdsa/ecdsa.go b/src/crypto/ecdsa/ecdsa.go -index e1503779ae421c..e8f8b85fdac62e 100644 +index 3ed15a888a7540..c516a4964c8708 100644 --- a/src/crypto/ecdsa/ecdsa.go +++ b/src/crypto/ecdsa/ecdsa.go @@ -26,9 +26,9 @@ import ( @@ -210,7 +210,7 @@ index 47c8698e2a5945..02eff207ae365a 100644 "crypto/sha512" "encoding/hex" diff --git a/src/crypto/hmac/hmac.go b/src/crypto/hmac/hmac.go -index 35b9d5a17aa545..d6dc0244f7eba8 100644 +index 46ec81b8c58bc9..1563eedf6f78d1 100644 --- a/src/crypto/hmac/hmac.go +++ b/src/crypto/hmac/hmac.go @@ -22,7 +22,7 @@ timing side-channels: @@ -576,7 +576,7 @@ index 00000000000000..5e4b436554d44d +// from complaining about the missing body +// (because the implementation might be here). diff --git a/src/crypto/md5/md5.go b/src/crypto/md5/md5.go -index ccee4ea3a9914f..206249f5bf261e 100644 +index 83e9e4c07a0a5e..1e6a419587db00 100644 --- a/src/crypto/md5/md5.go +++ b/src/crypto/md5/md5.go @@ -12,6 +12,7 @@ package md5 @@ -588,7 +588,7 @@ index ccee4ea3a9914f..206249f5bf261e 100644 "errors" "hash" @@ -99,6 +100,9 @@ func consumeUint32(b []byte) ([]byte, uint32) { - // implements encoding.BinaryMarshaler and encoding.BinaryUnmarshaler to + // implements [encoding.BinaryMarshaler] and [encoding.BinaryUnmarshaler] to // marshal and unmarshal the internal state of the hash. func New() hash.Hash { + if boring.Enabled && boring.SupportsHash(crypto.MD5) { @@ -671,7 +671,7 @@ index 2abc0436405f8a..34c22c8fbba7da 100644 func boringPublicKey(*PublicKey) (*boring.PublicKeyRSA, error) { panic("boringcrypto: not available") diff --git a/src/crypto/rsa/pkcs1v15.go b/src/crypto/rsa/pkcs1v15.go -index 55fea1ab93d29a..05357064930a92 100644 +index 2705036fddf4c1..fc1cba42579f1e 100644 --- a/src/crypto/rsa/pkcs1v15.go +++ b/src/crypto/rsa/pkcs1v15.go @@ -6,7 +6,7 @@ package rsa @@ -684,7 +684,7 @@ index 55fea1ab93d29a..05357064930a92 100644 "crypto/subtle" "errors" diff --git a/src/crypto/rsa/pss.go b/src/crypto/rsa/pss.go -index 3a377cc9dbbddb..1096f5fbbb8846 100644 +index b63b6eb01db637..27241df1867cb5 100644 --- a/src/crypto/rsa/pss.go +++ b/src/crypto/rsa/pss.go @@ -9,7 +9,7 @@ package rsa @@ -697,7 +697,7 @@ index 3a377cc9dbbddb..1096f5fbbb8846 100644 "hash" "io" diff --git a/src/crypto/rsa/rsa.go b/src/crypto/rsa/rsa.go -index f0aef1f542bec9..7f44522c7fe8c0 100644 +index 0715421187d8b1..90d05432ed102b 100644 --- a/src/crypto/rsa/rsa.go +++ b/src/crypto/rsa/rsa.go @@ -27,9 +27,9 @@ package rsa @@ -726,7 +726,7 @@ index 3278a7ff305766..95f4b8e98d2fb0 100644 . "crypto/rsa" "crypto/sha1" diff --git a/src/crypto/sha1/sha1.go b/src/crypto/sha1/sha1.go -index bde642d905d70b..e73c1a6560a5fd 100644 +index ac10fa15574f32..7d5fbdecee9af9 100644 --- a/src/crypto/sha1/sha1.go +++ b/src/crypto/sha1/sha1.go @@ -10,7 +10,7 @@ package sha1 @@ -752,7 +752,7 @@ index 85ed12609154ff..bc169888786321 100644 "encoding" "fmt" diff --git a/src/crypto/sha256/sha256.go b/src/crypto/sha256/sha256.go -index 2deafbc9fcd0f9..b6fd0c3aab5100 100644 +index 0cc7fca0a606be..c352fc6351fbf7 100644 --- a/src/crypto/sha256/sha256.go +++ b/src/crypto/sha256/sha256.go @@ -8,7 +8,7 @@ package sha256 @@ -804,7 +804,7 @@ index 921cdbb7bbd477..2fef7ddae07480 100644 "encoding" "encoding/hex" diff --git a/src/crypto/tls/cipher_suites.go b/src/crypto/tls/cipher_suites.go -index 589e8b6fafbba3..0a6d665ee3096d 100644 +index 3f976c9c58b7f3..ed47943e9c6e8d 100644 --- a/src/crypto/tls/cipher_suites.go +++ b/src/crypto/tls/cipher_suites.go @@ -10,7 +10,7 @@ import ( @@ -1187,7 +1187,7 @@ index 8233985a62bd22..f46d4636557714 100644 serverMACString := hex.EncodeToString(serverMAC) clientKeyString := hex.EncodeToString(clientKey) diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go -index 187dff74cfcb54..0fc11c2fb3ae7b 100644 +index fcd5e939980f52..f10ecff5168acc 100644 --- a/src/go/build/deps_test.go +++ b/src/go/build/deps_test.go @@ -428,6 +428,7 @@ var depsRules = ` From 144711a760f918f00473c7e9e5745e26685c27d6 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 16 Oct 2023 16:27:33 -0500 Subject: [PATCH 3/3] Update submodule to latest master (5873bd1d) --- go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go b/go index 991b8cd8865..5873bd1d7e8 160000 --- a/go +++ b/go @@ -1 +1 @@ -Subproject commit 991b8cd886593a5a0d01a7d6297aea42b27013f6 +Subproject commit 5873bd1d7e87e0686390d71a840a44e2e2c3e11d