diff options
| author | Filippo Valsorda <filippo@golang.org> | 2021-05-08 01:07:30 -0400 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2021-10-04 17:17:11 +0000 |
| commit | cc5e3de593afca73cf1b4d732ddceffb2837b390 (patch) | |
| tree | b35d4c5b15898c20e8a659ec9e8da75a7d84667e /src/crypto/tls | |
| parent | 94323206aee1363471a4ae3b8d40dd4ae7a5cd9c (diff) | |
| download | go-cc5e3de593afca73cf1b4d732ddceffb2837b390.tar.xz | |
crypto/tls: use cryptobyte.NewFixedBuilder
Change-Id: Ia2a9465680e766336dae34f5d2b3cb412185bf1f
Reviewed-on: https://go-review.googlesource.com/c/go/+/318131
Trust: Filippo Valsorda <filippo@golang.org>
Run-TryBot: Filippo Valsorda <filippo@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Roland Shoemaker <roland@golang.org>
Diffstat (limited to 'src/crypto/tls')
| -rw-r--r-- | src/crypto/tls/handshake_messages.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/crypto/tls/handshake_messages.go b/src/crypto/tls/handshake_messages.go index b5f81e4436..17cf85910f 100644 --- a/src/crypto/tls/handshake_messages.go +++ b/src/crypto/tls/handshake_messages.go @@ -329,8 +329,7 @@ func (m *clientHelloMsg) updateBinders(pskBinders [][]byte) { m.pskBinders = pskBinders if m.raw != nil { lenWithoutBinders := len(m.marshalWithoutBinders()) - // TODO(filippo): replace with NewFixedBuilder once CL 148882 is imported. - b := cryptobyte.NewBuilder(m.raw[:lenWithoutBinders]) + b := cryptobyte.NewFixedBuilder(m.raw[:lenWithoutBinders]) b.AddUint16LengthPrefixed(func(b *cryptobyte.Builder) { for _, binder := range m.pskBinders { b.AddUint8LengthPrefixed(func(b *cryptobyte.Builder) { @@ -338,7 +337,7 @@ func (m *clientHelloMsg) updateBinders(pskBinders [][]byte) { }) } }) - if len(b.BytesOrPanic()) != len(m.raw) { + if out, err := b.Bytes(); err != nil || len(out) != len(m.raw) { panic("tls: internal error: failed to update binders") } } |