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

sync: Go 1.21.0

Browse source 
* [release-branch.go1.21] crypto/tls: change SendSessionTicket to take an options struct

To allow for future evolution of the API, make
QUICConn.SendSessionTicket take a QUICSessionTicketOptions
rather than a single bool.

Change-Id: I798fd0feec5c7581e3c3574e2de99611c81df47f
Reviewed-on: https://go-review.googlesource.com/c/go/+/514997
Reviewed-by: Roland Shoemaker <roland@golang.org>
Run-TryBot: Damien Neil <dneil@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Marten Seemann <martenseemann@gmail.com>
(cherry picked from commit a915b99)
Reviewed-on: https://go-review.googlesource.com/c/go/+/515335
Auto-Submit: Damien Neil <dneil@google.com>
Co-Authored-By: Damien Neil <52544+neild@users.noreply.github.com>
This commit is contained in:
Gaukas Wang 2023-08-08 19:52:38 -06:00
parent 30a2200750
commit 34188c8042
No known key found for this signature in database
GPG key ID: 9E2F8986D76F8B5D
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
quic.go
View file

@ -246,10 +246,15 @@ func (q *QUICConn) HandleData(level QUICEncryptionLevel, data []byte) error {
return nil return nil
} }
type QUICSessionTicketOptions struct {
// EarlyData specifies whether the ticket may be used for 0-RTT.
EarlyData bool
}
// SendSessionTicket sends a session ticket to the client. // SendSessionTicket sends a session ticket to the client.
// It produces connection events, which may be read with NextEvent. // It produces connection events, which may be read with NextEvent.
// Currently, it can only be called once. // Currently, it can only be called once.
func (q *QUICConn) SendSessionTicket(earlyData bool) error { func (q *QUICConn) SendSessionTicket(opts QUICSessionTicketOptions) error {
c := q.conn c := q.conn
if !c.isHandshakeComplete.Load() { if !c.isHandshakeComplete.Load() {
return quicError(errors.New("tls: SendSessionTicket called before handshake completed")) return quicError(errors.New("tls: SendSessionTicket called before handshake completed"))
@ -261,7 +266,7 @@ func (q *QUICConn) SendSessionTicket(earlyData bool) error {
return quicError(errors.New("tls: SendSessionTicket called multiple times")) return quicError(errors.New("tls: SendSessionTicket called multiple times"))
} }
q.sessionTicketSent = true q.sessionTicketSent = true
return quicError(c.sendSessionTicket(earlyData)) return quicError(c.sendSessionTicket(opts.EarlyData))
} }
// ConnectionState returns basic TLS details about the connection. // ConnectionState returns basic TLS details about the connection.

3
quic_test.go
View file

@ -125,7 +125,8 @@ func runTestQUICConnection(ctx context.Context, cli, srv *testQUICConn, onHandle
case QUICHandshakeDone: case QUICHandshakeDone:
a.complete = true a.complete = true
if a == srv { if a == srv {
if err := srv.conn.SendSessionTicket(false); err != nil { opts := QUICSessionTicketOptions{}
if err := srv.conn.SendSessionTicket(opts); err != nil {
return err return err
} }
} }