qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 15:56:57 -07:00
Code Releases Activity

crypto/tls: change SendSessionTicket to take an options struct

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

For #60107

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>
This commit is contained in:
Damien Neil 2023-08-01 13:33:37 -07:00
parent a09ea59198
commit a915b999c9
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/go1.21.txt
View File

@ -60,7 +60,9 @@ pkg crypto/tls, method (*QUICConn) Close() error #44886
pkg crypto/tls, method (*QUICConn) ConnectionState() ConnectionState #44886 pkg crypto/tls, method (*QUICConn) ConnectionState() ConnectionState #44886
pkg crypto/tls, method (*QUICConn) HandleData(QUICEncryptionLevel, []uint8) error #44886 pkg crypto/tls, method (*QUICConn) HandleData(QUICEncryptionLevel, []uint8) error #44886
pkg crypto/tls, method (*QUICConn) NextEvent() QUICEvent #44886 pkg crypto/tls, method (*QUICConn) NextEvent() QUICEvent #44886
pkg crypto/tls, method (*QUICConn) SendSessionTicket(bool) error #60107 pkg crypto/tls, method (*QUICConn) SendSessionTicket(QUICSessionTicketOptions) error #60107
pkg crypto/tls, type QUICSessionTicketOptions struct #60107
pkg crypto/tls, type QUICSessionTicketOptions struct, EarlyData bool #60107
pkg crypto/tls, method (*QUICConn) SetTransportParameters([]uint8) #44886 pkg crypto/tls, method (*QUICConn) SetTransportParameters([]uint8) #44886
pkg crypto/tls, method (*QUICConn) Start(context.Context) error #44886 pkg crypto/tls, method (*QUICConn) Start(context.Context) error #44886
pkg crypto/tls, method (QUICEncryptionLevel) String() string #44886 pkg crypto/tls, method (QUICEncryptionLevel) String() string #44886

9
src/crypto/tls/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
src/crypto/tls/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
} }
} }