gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

introduce a marshaling format for data saved in the session ticket

Browse Source
This commit is contained in:
Marten Seemann
2020-02-02 10:52:52 +07:00
parent a8fc893ec4
commit 3e32a693ad
5 changed files with 104 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/handshake/crypto_setup.go
View File

@@ -444,7 +444,9 @@ func (h *cryptoSetup) handleTransportParameters(data []byte) {
// must be called after receiving the transport parameters
func (h *cryptoSetup) marshalPeerParamsForSessionState() []byte {
return h.peerParams.MarshalForSessionTicket()
b := &bytes.Buffer{}
h.peerParams.MarshalForSessionTicket(b)
return b.Bytes()
}
func (h *cryptoSetup) handlePeerParamsFromSessionState(data []byte) {
@@ -477,7 +479,7 @@ func (h *cryptoSetup) maybeSendSessionTicket() {
var appData []byte
// Save transport parameters to the session ticket if we're allowing 0-RTT.
if h.tlsConf.MaxEarlyData > 0 {
appData = h.ourParams.MarshalForSessionTicket()
appData = (&sessionTicket{Parameters: h.ourParams}).Marshal()
}
ticket, err := h.conn.GetSessionTicket(appData)
if err != nil {
@@ -492,12 +494,12 @@ func (h *cryptoSetup) maybeSendSessionTicket() {
// accept0RTT is called for the server when receiving the client's session ticket.
// It decides whether to accept 0-RTT.
func (h *cryptoSetup) accept0RTT(sessionTicketData []byte) bool {
var tp TransportParameters
if err := tp.UnmarshalFromSessionTicket(sessionTicketData); err != nil {
var t sessionTicket
if err := t.Unmarshal(sessionTicketData); err != nil {
h.logger.Debugf("Unmarshaling transport parameters from session ticket failed: %s", err.Error())
return false
}
valid := h.ourParams.ValidFor0RTT(&tp)
valid := h.ourParams.ValidFor0RTT(t.Parameters)
if valid {
h.logger.Debugf("Accepting 0-RTT.")
} else {