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

try decrypting undecryptable packets when the encryption level changes

Browse Source 
There's no need to do this asynchronously any more when using TLS.
This commit is contained in:
Marten Seemann
2018-10-20 11:40:33 +09:00
parent 387c28d707
commit b63c81f0bf
5 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crypto_stream_manager.go
View File

@@ -30,7 +30,7 @@ func newCryptoStreamManager(
}
}
func (m *cryptoStreamManager) HandleCryptoFrame(frame *wire.CryptoFrame, encLevel protocol.EncryptionLevel) error {
func (m *cryptoStreamManager) HandleCryptoFrame(frame *wire.CryptoFrame, encLevel protocol.EncryptionLevel) (bool /* encryption level changed */, error) {
var str cryptoStream
switch encLevel {
case protocol.EncryptionInitial:
@@ -38,18 +38,18 @@ func (m *cryptoStreamManager) HandleCryptoFrame(frame *wire.CryptoFrame, encLeve
case protocol.EncryptionHandshake:
str = m.handshakeStream
default:
return fmt.Errorf("received CRYPTO frame with unexpected encryption level: %s", encLevel)
return false, fmt.Errorf("received CRYPTO frame with unexpected encryption level: %s", encLevel)
}
if err := str.HandleCryptoFrame(frame); err != nil {
return err
return false, err
}
for {
data := str.GetCryptoData()
if data == nil {
return nil
return false, nil
}
if encLevelFinished := m.cryptoHandler.HandleMessage(data, encLevel); encLevelFinished {
return str.Finish()
return true, str.Finish()
}
}
}