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

crypto/tls: make SessionState.Extra a slice of byte slices

Browse source 
Fixes #60539
Updates #60105

Change-Id: I7b567cc1d0901891ed97d29591db935cd487cc71
Reviewed-on: https://go-review.googlesource.com/c/go/+/501675
Auto-Submit: Filippo Valsorda <filippo@golang.org>
Run-TryBot: Filippo Valsorda <filippo@golang.org>
Reviewed-by: Roland Shoemaker <roland@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Damien Neil <dneil@google.com>
This commit is contained in:
Filippo Valsorda 2023-06-07 21:36:19 +02:00 • committed by Gopher Robot
parent 4728f31b2f
commit cb03457ffc
2 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
handshake_messages_test.go
View file

@ -355,7 +355,9 @@ func (*SessionState) Generate(rand *rand.Rand, size int) reflect.Value {
s.cipherSuite = uint16(rand.Intn(math.MaxUint16)) s.cipherSuite = uint16(rand.Intn(math.MaxUint16))
s.createdAt = uint64(rand.Int63()) s.createdAt = uint64(rand.Int63())
s.secret = randomBytes(rand.Intn(100)+1, rand) s.secret = randomBytes(rand.Intn(100)+1, rand)
s.Extra = randomBytes(rand.Intn(100), rand) for n, i := rand.Intn(3), 0; i < n; i++ {
s.Extra = append(s.Extra, randomBytes(rand.Intn(100), rand))
}
if rand.Intn(10) > 5 { if rand.Intn(10) > 5 {
s.EarlyData = true s.EarlyData = true
} }

31
ticket.go
View file

@ -27,13 +27,15 @@ type SessionState struct {
// //
// Certificate CertificateChain<0..2^24-1>; // Certificate CertificateChain<0..2^24-1>;
// //
// opaque Extra<0..2^24-1>;
//
// struct { // struct {
// uint16 version; // uint16 version;
// SessionStateType type; // SessionStateType type;
// uint16 cipher_suite; // uint16 cipher_suite;
// uint64 created_at; // uint64 created_at;
// opaque secret<1..2^8-1>; // opaque secret<1..2^8-1>;
// opaque extra<0..2^24-1>; // Extra extra<0..2^24-1>;
// uint8 ext_master_secret = { 0, 1 }; // uint8 ext_master_secret = { 0, 1 };
// uint8 early_data = { 0, 1 }; // uint8 early_data = { 0, 1 };
// CertificateEntry certificate_list<0..2^24-1>; // CertificateEntry certificate_list<0..2^24-1>;
@ -62,12 +64,13 @@ type SessionState struct {
// //
// This allows [Config.UnwrapSession]/[Config.WrapSession] and // This allows [Config.UnwrapSession]/[Config.WrapSession] and
// [ClientSessionCache] implementations to store and retrieve additional // [ClientSessionCache] implementations to store and retrieve additional
// data. // data alongside this session.
// //
// If Extra is already set, the implementation must preserve the previous // To allow different layers in a protocol stack to share this field,
// value across a round-trip, for example by appending and stripping a // applications must only append to it, not replace it, and must use entries
// fixed-length suffix. // that can be recognized even if out of order (for example, by starting
Extra []byte // with a id and version prefix).
Extra [][]byte
// EarlyData indicates whether the ticket can be used for 0-RTT in a QUIC // EarlyData indicates whether the ticket can be used for 0-RTT in a QUIC
// connection. The application may set this to false if it is true to // connection. The application may set this to false if it is true to
@ -115,7 +118,11 @@ func (s *SessionState) Bytes() ([]byte, error) {
b.AddBytes(s.secret) b.AddBytes(s.secret)
}) })
b.AddUint24LengthPrefixed(func(b *cryptobyte.Builder) { b.AddUint24LengthPrefixed(func(b *cryptobyte.Builder) {
b.AddBytes(s.Extra) for _, extra := range s.Extra {
b.AddUint24LengthPrefixed(func(b *cryptobyte.Builder) {
b.AddBytes(extra)
})
}
}) })
if s.extMasterSecret { if s.extMasterSecret {
b.AddUint8(1) b.AddUint8(1)
@ -176,19 +183,27 @@ func ParseSessionState(data []byte) (*SessionState, error) {
s := cryptobyte.String(data) s := cryptobyte.String(data)
var typ, extMasterSecret, earlyData uint8 var typ, extMasterSecret, earlyData uint8
var cert Certificate var cert Certificate
var extra cryptobyte.String
if !s.ReadUint16(&ss.version) || if !s.ReadUint16(&ss.version) ||
!s.ReadUint8(&typ) || !s.ReadUint8(&typ) ||
(typ != 1 && typ != 2) || (typ != 1 && typ != 2) ||
!s.ReadUint16(&ss.cipherSuite) || !s.ReadUint16(&ss.cipherSuite) ||
!readUint64(&s, &ss.createdAt) || !readUint64(&s, &ss.createdAt) ||
!readUint8LengthPrefixed(&s, &ss.secret) || !readUint8LengthPrefixed(&s, &ss.secret) ||
!readUint24LengthPrefixed(&s, &ss.Extra) || !s.ReadUint24LengthPrefixed(&extra) ||
!s.ReadUint8(&extMasterSecret) || !s.ReadUint8(&extMasterSecret) ||
!s.ReadUint8(&earlyData) || !s.ReadUint8(&earlyData) ||
len(ss.secret) == 0 || len(ss.secret) == 0 ||
!unmarshalCertificate(&s, &cert) { !unmarshalCertificate(&s, &cert) {
return nil, errors.New("tls: invalid session encoding") return nil, errors.New("tls: invalid session encoding")
} }
for !extra.Empty() {
var e []byte
if !readUint24LengthPrefixed(&extra, &e) {
return nil, errors.New("tls: invalid session encoding")
}
ss.Extra = append(ss.Extra, e)
}
switch extMasterSecret { switch extMasterSecret {
case 0: case 0:
ss.extMasterSecret = false ss.extMasterSecret = false