mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-03 20:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

crypto/tls: remove NPN support

Browse source 
RELNOTE=yes

Fixes #28362

Change-Id: I43813c0c17bbe6c4cbb4d1f121518c434b3f5aa8
Reviewed-on: https://go-review.googlesource.com/c/go/+/174329
Reviewed-by: Filippo Valsorda <filippo@golang.org>
This commit is contained in:
Brad Fitzpatrick 2019-04-29 22:04:09 +00:00
parent cfa6449e5b
commit 6b5dc9f4ba
9 changed files with 121 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

94
handshake_messages.go
View file

@ -6,8 +6,9 @@ package tls
import (
"fmt"
"golang.org/x/crypto/cryptobyte"
"strings"
"golang.org/x/crypto/cryptobyte"
)
// The marshalingFunction type is an adapter to allow the use of ordinary
@ -72,7 +73,6 @@ type clientHelloMsg struct {
sessionId []byte
cipherSuites []uint16
compressionMethods []uint8
nextProtoNeg bool
serverName string
ocspStapling bool
supportedCurves []CurveID
@ -121,11 +121,6 @@ func (m *clientHelloMsg) marshal() []byte {
bWithoutExtensions := *b
b.AddUint16LengthPrefixed(func(b *cryptobyte.Builder) {
if m.nextProtoNeg {
// draft-agl-tls-nextprotoneg-04
b.AddUint16(extensionNextProtoNeg)
b.AddUint16(0) // empty extension_data
}
if len(m.serverName) > 0 {
// RFC 6066, Section 3
b.AddUint16(extensionServerName)
@ -426,9 +421,6 @@ func (m *clientHelloMsg) unmarshal(data []byte) bool {
return false
}
}
case extensionNextProtoNeg:
// draft-agl-tls-nextprotoneg-04
m.nextProtoNeg = true
case extensionStatusRequest:
// RFC 4366, Section 3.6
var statusType uint8
@ -604,8 +596,6 @@ type serverHelloMsg struct {
sessionId []byte
cipherSuite uint16
compressionMethod uint8
nextProtoNeg bool
nextProtos []string
ocspStapling bool
ticketSupported bool
secureRenegotiationSupported bool
@ -643,16 +633,6 @@ func (m *serverHelloMsg) marshal() []byte {
bWithoutExtensions := *b
b.AddUint16LengthPrefixed(func(b *cryptobyte.Builder) {
if m.nextProtoNeg {
b.AddUint16(extensionNextProtoNeg)
b.AddUint16LengthPrefixed(func(b *cryptobyte.Builder) {
for _, proto := range m.nextProtos {
b.AddUint8LengthPrefixed(func(b *cryptobyte.Builder) {
b.AddBytes([]byte(proto))
})
}
})
}
if m.ocspStapling {
b.AddUint16(extensionStatusRequest)
b.AddUint16(0) // empty extension_data
@ -771,16 +751,6 @@ func (m *serverHelloMsg) unmarshal(data []byte) bool {
}
switch extension {
case extensionNextProtoNeg:
m.nextProtoNeg = true
for !extData.Empty() {
var proto cryptobyte.String
if !extData.ReadUint8LengthPrefixed(&proto) ||
proto.Empty() {
return false
}
m.nextProtos = append(m.nextProtos, string(proto))
}
case extensionStatusRequest:
m.ocspStapling = true
case extensionSessionTicket:
@ -1579,66 +1549,6 @@ func (m *finishedMsg) unmarshal(data []byte) bool {
s.Empty()
}
type nextProtoMsg struct {
raw []byte
proto string
}
func (m *nextProtoMsg) marshal() []byte {
if m.raw != nil {
return m.raw
}
l := len(m.proto)
if l > 255 {
l = 255
}
padding := 32 - (l+2)%32
length := l + padding + 2
x := make([]byte, length+4)
x[0] = typeNextProtocol
x[1] = uint8(length >> 16)
x[2] = uint8(length >> 8)
x[3] = uint8(length)
y := x[4:]
y[0] = byte(l)
copy(y[1:], []byte(m.proto[0:l]))
y = y[1+l:]
y[0] = byte(padding)
m.raw = x
return x
}
func (m *nextProtoMsg) unmarshal(data []byte) bool {
m.raw = data
if len(data) < 5 {
return false
}
data = data[4:]
protoLen := int(data[0])
data = data[1:]
if len(data) < protoLen {
return false
}
m.proto = string(data[0:protoLen])
data = data[protoLen:]
if len(data) < 1 {
return false
}
paddingLen := int(data[0])
data = data[1:]
if len(data) != paddingLen {
return false
}
return true
}
type certificateRequestMsg struct {
raw []byte
// hasSignatureAlgorithm indicates whether this message includes a list of