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

Merge pull request #2358 from lucas-clemente/drop-0rtt-keys

Browse Source 
drop 0-RTT read keys after 3 PTO
This commit is contained in:
Marten Seemann
2020-02-20 16:47:14 +07:00
committed by GitHub
parent 23059d5a68 d08c2145a4
commit ad7327845c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/handshake/crypto_setup.go
View File

@@ -8,6 +8,7 @@ import (
"io" "io"
"net" "net"
"sync" "sync"
"time"
"github.com/lucas-clemente/quic-go/internal/congestion" "github.com/lucas-clemente/quic-go/internal/congestion"
"github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/protocol"
@@ -95,6 +96,8 @@ type cryptoSetup struct {
mutex sync.Mutex // protects all members below mutex sync.Mutex // protects all members below
handshakeCompleteTime time.Time
readEncLevel protocol.EncryptionLevel readEncLevel protocol.EncryptionLevel
writeEncLevel protocol.EncryptionLevel writeEncLevel protocol.EncryptionLevel
@@ -244,6 +247,9 @@ func (h *cryptoSetup) RunHandshake() {
select { select {
case <-handshakeComplete: // return when the handshake is done case <-handshakeComplete: // return when the handshake is done
h.mutex.Lock()
h.handshakeCompleteTime = time.Now()
h.mutex.Unlock()
h.runner.OnHandshakeComplete() h.runner.OnHandshakeComplete()
case <-h.closeChan: case <-h.closeChan:
close(h.messageChan) close(h.messageChan)
@@ -764,6 +770,11 @@ func (h *cryptoSetup) Get1RTTOpener() (ShortHeaderOpener, error) {
h.mutex.Lock() h.mutex.Lock()
defer h.mutex.Unlock() defer h.mutex.Unlock()
if h.zeroRTTOpener != nil && time.Since(h.handshakeCompleteTime) > 3*h.rttStats.PTO(true) {
h.zeroRTTOpener = nil
h.logger.Debugf("Dropping 0-RTT keys.")
}
if !h.has1RTTOpener { if !h.has1RTTOpener {
return nil, ErrKeysNotYetAvailable return nil, ErrKeysNotYetAvailable
} }