diff options
author | Chressie Himpel <chressie@google.com> | 2022-04-27 20:09:28 +0200 |
---|---|---|
committer | Chressie Himpel <chressie@google.com> | 2022-04-27 20:09:28 +0200 |
commit | ec7f5165ddc680efbac18dc15b4905844d9e8db9 (patch) | |
tree | eacc43345e3d6f0adfda16bfcf66e7e5096a85b9 /src/crypto/tls/handshake_messages.go | |
parent | ca6fd39cf6498d4507fc7cdaced55620c283a503 (diff) | |
parent | f0ee7fda636408b4f04ca3f3b11788f662c90610 (diff) | |
download | go-ec7f5165ddc680efbac18dc15b4905844d9e8db9.tar.gz go-ec7f5165ddc680efbac18dc15b4905844d9e8db9.zip |
[dev.boringcrypto] all: merge master into dev.boringcrypto
Change-Id: Ic5f71c04f08c03319c043f35be501875adb0a3b0
Diffstat (limited to 'src/crypto/tls/handshake_messages.go')
-rw-r--r-- | src/crypto/tls/handshake_messages.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/crypto/tls/handshake_messages.go b/src/crypto/tls/handshake_messages.go index 17cf85910fa..7ab0f100b8b 100644 --- a/src/crypto/tls/handshake_messages.go +++ b/src/crypto/tls/handshake_messages.go @@ -384,6 +384,7 @@ func (m *clientHelloMsg) unmarshal(data []byte) bool { return false } + seenExts := make(map[uint16]bool) for !extensions.Empty() { var extension uint16 var extData cryptobyte.String @@ -392,6 +393,11 @@ func (m *clientHelloMsg) unmarshal(data []byte) bool { return false } + if seenExts[extension] { + return false + } + seenExts[extension] = true + switch extension { case extensionServerName: // RFC 6066, Section 3 @@ -750,6 +756,7 @@ func (m *serverHelloMsg) unmarshal(data []byte) bool { return false } + seenExts := make(map[uint16]bool) for !extensions.Empty() { var extension uint16 var extData cryptobyte.String @@ -758,6 +765,11 @@ func (m *serverHelloMsg) unmarshal(data []byte) bool { return false } + if seenExts[extension] { + return false + } + seenExts[extension] = true + switch extension { case extensionStatusRequest: m.ocspStapling = true |