Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Send "supported_groups" in encrypted extensions #375

Closed
wants to merge 8 commits into from
Closed

Send "supported_groups" in encrypted extensions #375

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ed33129
Simplify encrypted extensions with catMaybes
ocheron Jun 29, 2019
a6fba74
Send "supported_groups" in encrypted extensions
ocheron Jun 29, 2019
2eae3fa
Check that server responds with group sent by client
ocheron Jun 30, 2019
1707332
Add hookRecvHandshake13
ocheron Jul 15, 2019
5178227
Test "supported_groups" in encrypted extensions
ocheron Jul 16, 2019
78cbd76
Rename variable to name already used elsewhere
ocheron Jul 17, 2019
e4ec43e
Test TLS13 marshalling
ocheron Jul 18, 2019
6c007b9
Test marshalling with extension lists
ocheron Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions core/Network/TLS/Handshake/Server.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,16 +888,17 @@ doHandshake13 sparams ctx allCreds chosenVersion usedCipher exts usedHash client
sendExtensions rtt0OK = do
extensions' <- liftIO $ applicationProtocol ctx exts sparams
kazu-yamamoto marked this conversation as resolved.
Show resolved Hide resolved
msni <- liftIO $ usingState_ ctx getClientSNI
let extensions'' = case msni of
let sniExtension = case msni of
-- RFC6066: In this event, the server SHALL include
-- an extension of type "server_name" in the
-- (extended) server hello. The "extension_data"
-- field of this extension SHALL be empty.
Just _ -> ExtensionRaw extensionID_ServerName "" : extensions'
Nothing -> extensions'
let extensions
| rtt0OK = ExtensionRaw extensionID_EarlyData (extensionEncode (EarlyDataIndication Nothing)) : extensions''
| otherwise = extensions''
Just _ -> Just $ ExtensionRaw extensionID_ServerName ""
Nothing -> Nothing
let earlyDataExtension
| rtt0OK = Just $ ExtensionRaw extensionID_EarlyData $ extensionEncode (EarlyDataIndication Nothing)
| otherwise = Nothing
let extensions = catMaybes [earlyDataExtension, sniExtension] ++ extensions'
loadPacket13 ctx $ Handshake13 [EncryptedExtensions13 extensions]

sendNewSessionTicket masterSecret sfSentTime = when sendNST $ do
Expand Down