Skip to content

Commit

Permalink
Merge pull request #1069 from microsoft/dev/auto-sync/microsoft/main
Browse files Browse the repository at this point in the history 
Update submodule to latest `master` in `microsoft/main`
  • Loading branch information
@microsoft-golang-review-bot
microsoft-golang-review-bot authored Oct 16, 2023
2 parents 7e735d8 + 144711a commit de2cf6c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion go
Submodule go updated 81 files
+1 −1 src/archive/tar/common.go
+1 −1 src/archive/tar/format.go
+7 −7 src/archive/tar/reader.go
+8 −8 src/archive/tar/writer.go
+10 −10 src/archive/zip/reader.go
+3 −3 src/archive/zip/register.go
+9 −9 src/archive/zip/struct.go
+18 −18 src/archive/zip/writer.go
+1 −1 src/bufio/scan.go
+26 −26 src/bytes/buffer.go
+13 −13 src/bytes/reader.go
+1 −1 src/compress/bzip2/bit_reader.go
+1 −1 src/compress/flate/inflate.go
+1 −1 src/compress/gzip/gunzip.go
+1 −1 src/compress/lzw/writer.go
+3 −3 src/compress/zlib/reader.go
+3 −3 src/crypto/aes/aes_gcm.go
+1 −1 src/crypto/aes/cipher.go
+1 −1 src/crypto/aes/ctr_s390x.go
+3 −3 src/crypto/aes/gcm_ppc64x.go
+5 −5 src/crypto/aes/gcm_s390x.go
+4 −4 src/crypto/cipher/cfb.go
+2 −2 src/crypto/cipher/ctr.go
+4 −4 src/crypto/cipher/gcm.go
+5 −5 src/crypto/cipher/io.go
+1 −1 src/crypto/cipher/ofb.go
+3 −3 src/crypto/crypto.go
+2 −2 src/crypto/des/cipher.go
+2 −2 src/crypto/dsa/dsa.go
+5 −5 src/crypto/ecdh/ecdh.go
+3 −3 src/crypto/ecdh/nist.go
+1 −1 src/crypto/ecdh/x25519.go
+4 −4 src/crypto/ecdsa/ecdsa.go
+1 −1 src/crypto/ecdsa/ecdsa_legacy.go
+14 −14 src/crypto/elliptic/elliptic.go
+27 −27 src/crypto/elliptic/params.go
+4 −4 src/crypto/hmac/hmac.go
+1 −1 src/crypto/md5/md5.go
+1 −1 src/crypto/rand/util.go
+2 −2 src/crypto/rc4/rc4.go
+1 −1 src/crypto/rsa/pkcs1v15.go
+1 −1 src/crypto/rsa/pss.go
+7 −7 src/crypto/rsa/rsa.go
+2 −2 src/crypto/sha1/sha1.go
+2 −2 src/crypto/sha256/sha256.go
+2 −2 src/crypto/tls/cipher_suites.go
+6 −6 src/crypto/tls/common.go
+16 −16 src/crypto/tls/conn.go
+6 −6 src/crypto/tls/quic.go
+1 −1 src/crypto/tls/ticket.go
+6 −6 src/crypto/tls/tls.go
+1 −1 src/crypto/x509/cert_pool.go
+1 −1 src/crypto/x509/parser.go
+1 −1 src/crypto/x509/pem_decrypt.go
+6 −6 src/crypto/x509/pkcs1.go
+4 −4 src/crypto/x509/pkcs8.go
+4 −4 src/crypto/x509/pkix/pkix.go
+1 −1 src/crypto/x509/sec1.go
+12 −12 src/crypto/x509/x509.go
+10 −10 src/expvar/expvar.go
+2 −2 src/hash/adler32/adler32.go
+11 −11 src/hash/crc32/crc32.go
+5 −5 src/hash/crc64/crc64.go
+6 −6 src/hash/fnv/fnv.go
+3 −3 src/hash/hash.go
+14 −14 src/hash/maphash/maphash.go
+13 −10 src/html/template/context.go
+13 −1 src/html/template/escape_test.go
+11 −19 src/html/template/transition.go
+2 −2 src/index/suffixarray/suffixarray.go
+1 −1 src/internal/coverage/decodemeta/decodefile.go
+1 −1 src/net/conf.go
+3 −0 src/runtime/export_test.go
+2 −2 src/runtime/map.go
+30 −0 src/runtime/map_test.go
+17 −0 src/strconv/example_test.go
+2 −2 src/strings/builder.go
+14 −14 src/strings/reader.go
+1 −1 src/strings/replace.go
+5 −5 src/strings/strings.go
+1 −1 src/time/zoneinfo_read.go
30 changes: 15 additions & 15 deletions patches/0002-Add-crypto-backend-foundation.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 @@
Expand Down Expand Up @@ -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 (
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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) {
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 (
Expand Down Expand Up @@ -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 = `
Expand Down

0 comments on commit de2cf6c

Please sign in to comment.