mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2739 from lucas-clemente/fix-handshake-fuzzer-enclevel

Browse source 
make sure to only pass handshake messages that keys are available for
This commit is contained in:
Marten Seemann 2020-09-04 21:28:12 +07:00 • committed by GitHub
commit bed802aee5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
fuzzing/handshake/fuzz.go
View file

@ -138,6 +138,27 @@ func toEncryptionLevel(n uint8) protocol.EncryptionLevel {
} }
} }
func maxEncLevel(cs handshake.CryptoSetup, encLevel protocol.EncryptionLevel) protocol.EncryptionLevel {
switch encLevel {
case protocol.EncryptionInitial:
return protocol.EncryptionInitial
case protocol.EncryptionHandshake:
// Handshake opener not available. We can't possibly read a Handshake handshake message.
if opener, err := cs.GetHandshakeOpener(); err != nil || opener == nil {
return protocol.EncryptionInitial
}
return protocol.EncryptionHandshake
case protocol.Encryption1RTT:
// 1-RTT opener not available. We can't possibly read a post-handshake message.
if opener, err := cs.Get1RTTOpener(); err != nil || opener == nil {
return maxEncLevel(cs, protocol.EncryptionHandshake)
}
return protocol.Encryption1RTT
default:
panic("unexpected encryption level")
}
}
// PrefixLen is the number of bytes used for configuration // PrefixLen is the number of bytes used for configuration
const PrefixLen = 2 const PrefixLen = 2
@ -233,7 +254,7 @@ messageLoop:
if len(b) > 0 && b[0] == messageToReplace { if len(b) > 0 && b[0] == messageToReplace {
fmt.Println("replacing message to the server", messageType(b[0]).String()) fmt.Println("replacing message to the server", messageType(b[0]).String())
b = data b = data
encLevel = messageToReplaceEncLevel encLevel = maxEncLevel(server, messageToReplaceEncLevel)
} }
server.HandleMessage(b, encLevel) server.HandleMessage(b, encLevel)
case c := <-sChunkChan: case c := <-sChunkChan:
@ -242,7 +263,7 @@ messageLoop:
if len(b) > 0 && b[0] == messageToReplace { if len(b) > 0 && b[0] == messageToReplace {
fmt.Println("replacing message to the client", messageType(b[0]).String()) fmt.Println("replacing message to the client", messageType(b[0]).String())
b = data b = data
encLevel = messageToReplaceEncLevel encLevel = maxEncLevel(client, messageToReplaceEncLevel)
} }
client.HandleMessage(b, encLevel) client.HandleMessage(b, encLevel)
case <-done: // test done case <-done: // test done